[io-layer] Remove wait.h

diff --git a/mono/dis/main.c b/mono/dis/main.c
index 53de00ae71577c4a902472c6a2448a648608bf62..d187f28780a3a5bf81e3271768e0f615cb56a0e2 100644 (file)
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -31,6 +31,7 @@
 #include <mono/metadata/loader.h>
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/appdomain.h>
+#include <mono/metadata/w32handle.h>
 #include <mono/utils/bsearch.h>
 #include <mono/utils/mono-counters.h>
 

diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index 2262281abaa44afc65ff5fe7bf65fc7f2b77d7ed..31fa343ed5bac58abdcb6ddc7f9a34e62a129877 100644 (file)
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -25,7 +25,6 @@ OTHER_H = \
        types.h         \
        uglify.h        \
        versioninfo.h   \
-       wait.h          \
        wapi.h          \
        wapi-remap.h
 
@@ -56,7 +55,6 @@ OTHER_SRC = \
        uglify.h                \
        versioninfo.c           \
        versioninfo.h           \
-       wait.h                  \
        wapi_glob.h             \
        wapi_glob.c             \
        wapi.h                  \

diff --git a/mono/io-layer/error.h b/mono/io-layer/error.h
index 1465b76c56d04ff6c841f79ba6ed8d6770220ff9..2b930fc79794ba70cef187cde5d0e3d3b014e4c5 100644 (file)
--- a/mono/io-layer/error.h
+++ b/mono/io-layer/error.h
@@ -187,7 +187,6 @@ typedef enum {
        ERROR_VC_DISCONNECTED = 240,
        ERROR_INVALID_EA_NAME = 254,
        ERROR_EA_LIST_INCONSISTENT = 255,
-       WAIT_TIMEOUT = 258,
        ERROR_NO_MORE_ITEMS = 259,
        ERROR_CANNOT_COPY = 266,
        ERROR_DIRECTORY = 267,

diff --git a/mono/io-layer/wait.h b/mono/io-layer/wait.h
deleted file mode 100644 (file)
index caa96eb..0000000
--- a/mono/io-layer/wait.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * wait.h:  wait for handles to become signalled
- *
- * Author:
- *     Dick Porter (dick@ximian.com)
- *
- * (C) 2002 Ximian, Inc.
- */
-
-#ifndef _WAPI_WAIT_H_
-#define _WAPI_WAIT_H_
-
-#include "mono/io-layer/status.h"
-#include "mono/metadata/w32handle.h"
-
-G_BEGIN_DECLS
-
-#define WAIT_FAILED            0xFFFFFFFF
-#define WAIT_OBJECT_0          ((STATUS_WAIT_0) +0)
-#define WAIT_ABANDONED         ((STATUS_ABANDONED_WAIT_0) +0)
-#define WAIT_ABANDONED_0       ((STATUS_ABANDONED_WAIT_0) +0)
-
-/* WAIT_TIMEOUT is also defined in error.h. Luckily it's the same value */
-#define WAIT_TIMEOUT           STATUS_TIMEOUT
-#define WAIT_IO_COMPLETION     STATUS_USER_APC
-
-G_END_DECLS
-#endif /* _WAPI_WAIT_H_ */

diff --git a/mono/io-layer/wapi.h b/mono/io-layer/wapi.h
index 520bb2f7ac673d699b71b886f518492407c98036..1ae5cc835438cddaa63d0b0cd7e28540087bfa15 100644 (file)
--- a/mono/io-layer/wapi.h
+++ b/mono/io-layer/wapi.h
@@ -10,6 +10,8 @@
 #ifndef _WAPI_WAPI_H_
 #define _WAPI_WAPI_H_
 
+#include <glib.h>
+
 #include <sys/types.h>
 
 #include <mono/io-layer/wapi-remap.h>
@@ -23,7 +25,15 @@
 #include <mono/io-layer/status.h>
 #include <mono/io-layer/timefuncs.h>
 #include <mono/io-layer/versioninfo.h>
-#include <mono/io-layer/wait.h>
+
+G_BEGIN_DECLS
+
+#define WAIT_FAILED            0xFFFFFFFF
+#define WAIT_OBJECT_0          ((STATUS_WAIT_0) +0)
+#define WAIT_ABANDONED         ((STATUS_ABANDONED_WAIT_0) +0)
+#define WAIT_ABANDONED_0       ((STATUS_ABANDONED_WAIT_0) +0)
+#define WAIT_TIMEOUT           STATUS_TIMEOUT
+#define WAIT_IO_COMPLETION     STATUS_USER_APC
 
 void
 wapi_init (void);
@@ -41,4 +51,6 @@ DuplicateHandle (gpointer srcprocess, gpointer src, gpointer targetprocess, gpoi
 pid_t
 wapi_getpid (void);
 
+G_END_DECLS
+
 #endif /* _WAPI_WAPI_H_ */

diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c
index 6930b8e3f5e91caefd0ea61d76127238595da906..2b267f44c596955681bf54e34984e0e14f540cf7 100644 (file)
--- a/mono/metadata/sgen-mono.c
+++ b/mono/metadata/sgen-mono.c
@@ -30,6 +30,7 @@
 #include "utils/mono-threads-coop.h"
 #include "sgen/sgen-thread-pool.h"
 #include "utils/mono-threads.h"
+#include "metadata/w32handle.h"
 
 #ifdef HEAVY_STATISTICS
 static guint64 stat_wbarrier_set_arrayref = 0;