[io-layer] Move _WAPI_FD_HANDLE, _WAPI_SHARED_NAMESPACE and _WAPI_HANDLE_INVALID...

diff --git a/mono/io-layer/handles-private.h b/mono/io-layer/handles-private.h
index fe4bf7b634b2cce173930d70d1eda7010d35fcc0..538e53485cdf5c046eb3daf5fa57f1c042c5c99f 100644 (file)
--- a/mono/io-layer/handles-private.h
+++ b/mono/io-layer/handles-private.h
@@ -21,6 +21,8 @@
 
 #undef DEBUG
 
+#define _WAPI_HANDLE_INVALID ((gpointer)(gsize)-1)
+
 typedef enum {
        WAPI_HANDLE_UNUSED=0,
        WAPI_HANDLE_FILE,
@@ -176,4 +178,31 @@ static inline void _wapi_handle_spin (guint32 ms)
        nanosleep (&sleepytime, NULL);
 }
 
+static gboolean
+_WAPI_SHARED_NAMESPACE (WapiHandleType type)
+{
+       switch (type) {
+       case WAPI_HANDLE_NAMEDMUTEX:
+       case WAPI_HANDLE_NAMEDSEM:
+       case WAPI_HANDLE_NAMEDEVENT:
+               return TRUE;
+       default:
+               return FALSE;
+       }
+}
+
+static gboolean
+_WAPI_FD_HANDLE (WapiHandleType type)
+{
+       switch (type) {
+       case WAPI_HANDLE_FILE:
+       case WAPI_HANDLE_CONSOLE:
+       case WAPI_HANDLE_SOCKET:
+       case WAPI_HANDLE_PIPE:
+               return TRUE;
+       default:
+               return FALSE;
+       }
+}
+
 #endif /* _WAPI_HANDLES_PRIVATE_H_ */

diff --git a/mono/io-layer/wapi-private.h b/mono/io-layer/wapi-private.h
index 7df49b9b1a5961dbe1771215b1fdda420efe3dd8..f859c4ffb81b2a06fc84ec8c503cf6d564700243 100644 (file)
--- a/mono/io-layer/wapi-private.h
+++ b/mono/io-layer/wapi-private.h
@@ -26,15 +26,6 @@ extern gboolean _wapi_has_shut_down;
 
 extern const char *_wapi_handle_typename[];
 
-#define _WAPI_FD_HANDLE(type) (type == WAPI_HANDLE_FILE || \
-                              type == WAPI_HANDLE_CONSOLE || \
-                              type == WAPI_HANDLE_SOCKET || \
-                              type == WAPI_HANDLE_PIPE)
-
-#define _WAPI_SHARED_NAMESPACE(type) (type == WAPI_HANDLE_NAMEDMUTEX || \
-                                     type == WAPI_HANDLE_NAMEDSEM || \
-                                     type == WAPI_HANDLE_NAMEDEVENT)
-
 typedef struct 
 {
        gchar name[MAX_PATH + 1];
@@ -79,8 +70,6 @@ struct _WapiFileShare
 
 typedef struct _WapiFileShare _WapiFileShare;
 
-#define _WAPI_HANDLE_INVALID (gpointer)-1
-
 pid_t
 _wapi_getpid (void);