Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGonzalo Paniagua Javier <gonzalo.mono@gmail.com>2009-09-09 08:11:09 +0400
committerGonzalo Paniagua Javier <gonzalo.mono@gmail.com>2009-09-09 08:11:09 +0400
commit2aecb29e6136804e5ddd287c87142ce238ccf55e (patch)
tree5b80612659cede3d6faaeaf49e0e191cd8f02b3c /support
parente197f2538845be4c96bcb4c89e55b9715b95c2f0 (diff)
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
Diffstat (limited to 'support')
-rw-r--r--support/ChangeLog5
-rw-r--r--support/Makefile.am2
-rw-r--r--support/zconf.h3
3 files changed, 9 insertions, 1 deletions
diff --git a/support/ChangeLog b/support/ChangeLog
index 10011b2212b..86e1c9536a1 100644
--- 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 9b6bc74b64e..1eb34794add 100644
--- 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 459fd520b3c..ac18d184fe0 100644
--- 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 */
+