Need <io.h> for open() and close().

2001-01-27  Tor Lillqvist  <tml@iki.fi>

	* gmodule.c: (Win32) Need <io.h> for open() and close().

2001-01-27  Tor Lillqvist  <tml@iki.fi>

	* makefile.msc.in: Don't try to compile gmarshal.c on its own.

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 364f251..4a5a953 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-27  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.c: (Win32) Need <io.h> for open() and close().
+
 2000-12-22  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gmodule.c: Make g_module_open more tolerant wrt to the module

diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index d3aefcf..25a6b37 100644 (file)
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -41,6 +41,9 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#if defined (G_OS_WIN32)
+# include <io.h>               /* For open() and close() prototypes. */
+#endif
 
 /* We maintain a list of modules, so we can reference count them.
  * That's needed because some platforms don't support refernce counts on

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 603790d..8a1d14c 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-27  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.msc.in: Don't try to compile gmarshal.c on its own.
+
 2001-01-24    <alexl@redhat.com>
 
        * gclosure.c (g_closure_unref):

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index 709854e..8496c56 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -24,7 +24,6 @@ gobject_OBJECTS =             \
        gbsearcharray.obj       \
        gclosure.obj            \
        genums.obj              \
-       gmarshal.obj            \
        gobject.obj             \
        gparam.obj              \
        gparamspecs.obj         \
@@ -44,3 +43,7 @@ gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
 
 glib-genmarshal.exe : glib-genmarshal.c
        $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib
+
+# I don't even try to build gmarshal.c and gmarshal.h here. If you try
+# to build this from CVS with MSVC, you will have to have a look in
+# Makefile.am or makefile.mingw.in to see how to do it.