X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fio-layer%2Fwapi-private.h;h=830405684b4f040fdff18dc7085f66a61bd3b7e5;hb=b528bf6d0bf14441ba8150060f74951d547f38c6;hp=918c1d4ee312b6219cdcb736a06cbd5423cf5ddc;hpb=538d3bb80572334c18ae117ea7703406a4a22872;p=mono.git diff --git a/mono/io-layer/wapi-private.h b/mono/io-layer/wapi-private.h index 918c1d4ee31..830405684b4 100644 --- a/mono/io-layer/wapi-private.h +++ b/mono/io-layer/wapi-private.h @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -24,8 +25,7 @@ /* Increment this whenever an incompatible change is made to the * shared handle structure. */ -/* Next time I change this, remember to fix the process count in shared.c */ -#define _WAPI_HANDLE_VERSION 10 +#define _WAPI_HANDLE_VERSION 12 typedef enum { WAPI_HANDLE_UNUSED=0, @@ -48,7 +48,6 @@ typedef enum { extern const char *_wapi_handle_typename[]; #define _WAPI_SHARED_HANDLE(type) (type == WAPI_HANDLE_PROCESS || \ - type == WAPI_HANDLE_THREAD || \ type == WAPI_HANDLE_NAMEDMUTEX || \ type == WAPI_HANDLE_NAMEDSEM || \ type == WAPI_HANDLE_NAMEDEVENT) @@ -123,7 +122,7 @@ struct _WapiHandle_shared_ref guint32 offset; }; -#define _WAPI_HANDLE_INITIAL_COUNT 4096 +#define _WAPI_HANDLE_INITIAL_COUNT 256 struct _WapiHandleUnshared { @@ -141,6 +140,7 @@ struct _WapiHandleUnshared struct _WapiHandle_mutex mutex; struct _WapiHandle_sem sem; struct _WapiHandle_socket sock; + struct _WapiHandle_thread thread; struct _WapiHandle_shared_ref shared; } u; }; @@ -154,7 +154,6 @@ struct _WapiHandleShared union { - struct _WapiHandle_thread thread; struct _WapiHandle_process process; struct _WapiHandle_namedmutex namedmutex; struct _WapiHandle_namedsem namedsem; @@ -182,6 +181,9 @@ struct _WapiHandleSharedLayout struct _WapiFileShare { +#ifdef WAPI_FILE_SHARE_PLATFORM_EXTRA_DATA + WAPI_FILE_SHARE_PLATFORM_EXTRA_DATA +#endif dev_t device; ino_t inode; pid_t opened_by_pid;