Fix includes. (#156500, #156499, Kazuki IWAMOTO)

2004-10-27  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c: Fix includes. (#156500, #156499,
	Kazuki IWAMOTO)

diff --git a/ChangeLog b/ChangeLog
index 44663c38f282899afa1d8f74253e174b51ee10a4..16526fd23e1774e0eb4cd73d79e07efa4c8bfddd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+       Kazuki IWAMOTO)
+
        * glib/Makefile.am (galias.h): Fix srcdir != builddir 
        builds.  (#156447, Thomas Fitzsimmons)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 44663c38f282899afa1d8f74253e174b51ee10a4..16526fd23e1774e0eb4cd73d79e07efa4c8bfddd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+       Kazuki IWAMOTO)
+
        * glib/Makefile.am (galias.h): Fix srcdir != builddir 
        builds.  (#156447, Thomas Fitzsimmons)
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 44663c38f282899afa1d8f74253e174b51ee10a4..16526fd23e1774e0eb4cd73d79e07efa4c8bfddd 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+       Kazuki IWAMOTO)
+
        * glib/Makefile.am (galias.h): Fix srcdir != builddir 
        builds.  (#156447, Thomas Fitzsimmons)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 44663c38f282899afa1d8f74253e174b51ee10a4..16526fd23e1774e0eb4cd73d79e07efa4c8bfddd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+       Kazuki IWAMOTO)
+
        * glib/Makefile.am (galias.h): Fix srcdir != builddir 
        builds.  (#156447, Thomas Fitzsimmons)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 44663c38f282899afa1d8f74253e174b51ee10a4..16526fd23e1774e0eb4cd73d79e07efa4c8bfddd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Fix includes. (#156500, #156499, 
+       Kazuki IWAMOTO)
+
        * glib/Makefile.am (galias.h): Fix srcdir != builddir 
        builds.  (#156447, Thomas Fitzsimmons)
 

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index acddd9f0dabe17530222fa9ef30744f70a39dd76..399f590be0af8f844b2104d870863de0ffddb286 100644 (file)
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -34,7 +34,12 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 #include "gconvert.h"
 #include "gdataset.h"