2009-09-09 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* zconf.h:
	* Makefile.am: attempt to fix the windows GCC build.

svn path=/trunk/mono/; revision=141562

diff --git a/support/ChangeLog b/support/ChangeLog
index 10011b2212b91a177ad52e7add34f071fb7d071e..86e1c9536a16061679c0ffc40cdc81face7a4ea9 100644 (file)
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-09 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * zconf.h:
+       * Makefile.am: attempt to fix the windows GCC build.
+
 2009-09-02  Rodrigo Kumpera  <rkumpera@novell.com>
 
        * time.c (Mono_Posix_Syscall_nanosleep): Avoid referencing unitialized

diff --git a/support/Makefile.am b/support/Makefile.am
index 9b6bc74b64e49260a2567b398325b5e7bdc1ed77..1eb34794add0ed13bda319e99a234abe4c53033b 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -51,7 +51,7 @@ MPH_UNIX_SOURCE =                             \
 
 if PLATFORM_WIN32
 MPH_SOURCE = $(MPH_C_SOURCE)
-MPH_LIBS   =
+MPH_LIBS   = $(GLIB_LIBS)
 else
 MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
 MPH_LIBS   = $(GLIB_LIBS)

diff --git a/support/zconf.h b/support/zconf.h
index 459fd520b3ca5186437bdfbf1a7b489f98f588b5..ac18d184fe04eee65117a497208400cfea092a33 100644 (file)
--- a/support/zconf.h
+++ b/support/zconf.h
@@ -393,5 +393,8 @@ typedef uLong FAR uLongf;
 #ifdef _MSC_VER
 #define NO_FSEEKO 1
 #define NO_vsnprintf 1
+#elif defined(WINDOWS)
+#define NO_FSEEKO 1
 #endif
 #endif /* ZCONF_H */
+