finished Discovery serialization stuff.

[mono.git] / eglib / src / gunicode.c

diff --git a/eglib/src/gunicode.c b/eglib/src/gunicode.c
index f7e156cac81478ca215f1a7a1d04de825342547d..7a98658a706675d23f79beb50fd433541ea2ac02 100644 (file)
--- a/eglib/src/gunicode.c
+++ b/eglib/src/gunicode.c
@@ -38,19 +38,21 @@
 #include <glib.h>
 #include <unicode-data.h>
 #include <errno.h>
-#ifdef _MSC_VER
-/* FIXME */
-#define CODESET 1
-#include <Windows.h>
 
-typedef int iconv_t;
+#if defined(_MSC_VER) || defined(G_OS_WIN32)
+/* FIXME */
+#  define CODESET 1
+#  include <windows.h>
+#  ifdef _MSC_VER
+       typedef int iconv_t;
+#  endif
 #else
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-#ifdef HAVE_ICONV_H
-#include <iconv.h>
-#endif
+#    ifdef HAVE_LANGINFO_H
+#       include <langinfo.h>
+#    endif
+#    ifdef HAVE_ICONV_H
+#       include <iconv.h>
+#    endif
 #endif
 
 static char *my_charset;