From 2def3c144fa4996636a7a3382dd4ff8f6e0dd76f Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Tue, 19 Apr 2005 08:08:36 +0000
Subject: [PATCH] Minor comment improvement.

2005-04-19  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.h: Minor comment improvement.

2005-04-18  Tor Lillqvist  <tml@novell.com>

	* glib/gfileutils.c: No <sys/wait.h> on Win32. Definition of
	save_errno was missing in one place.
---
 ChangeLog          | 9 +++++++++
 ChangeLog.pre-2-10 | 9 +++++++++
 ChangeLog.pre-2-12 | 9 +++++++++
 ChangeLog.pre-2-8  | 9 +++++++++
 glib/gfileutils.c  | 4 +++-
 glib/gutils.h      | 7 ++++---
 6 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 610b1f99a..cdaedebe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-19  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gutils.h: Minor comment improvement.
+
+2005-04-18  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c: No <sys/wait.h> on Win32. Definition of
+	save_errno was missing in one place.
+
 Sat Apr 16 20:15:44 2005  Soeren Sandmann  <sandmann@redhat.com>
 
 	* glib/gfileutils.c (g_file_replace): Save the errno in various
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 610b1f99a..cdaedebe5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-04-19  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gutils.h: Minor comment improvement.
+
+2005-04-18  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c: No <sys/wait.h> on Win32. Definition of
+	save_errno was missing in one place.
+
 Sat Apr 16 20:15:44 2005  Soeren Sandmann  <sandmann@redhat.com>
 
 	* glib/gfileutils.c (g_file_replace): Save the errno in various
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 610b1f99a..cdaedebe5 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+2005-04-19  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gutils.h: Minor comment improvement.
+
+2005-04-18  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c: No <sys/wait.h> on Win32. Definition of
+	save_errno was missing in one place.
+
 Sat Apr 16 20:15:44 2005  Soeren Sandmann  <sandmann@redhat.com>
 
 	* glib/gfileutils.c (g_file_replace): Save the errno in various
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 610b1f99a..cdaedebe5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-04-19  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gutils.h: Minor comment improvement.
+
+2005-04-18  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gfileutils.c: No <sys/wait.h> on Win32. Definition of
+	save_errno was missing in one place.
+
 Sat Apr 16 20:15:44 2005  Soeren Sandmann  <sandmann@redhat.com>
 
 	* glib/gfileutils.c (g_file_replace): Save the errno in various
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index b3c1565a2..cf21c061b 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -33,7 +33,9 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef G_OS_WIN32
 #include <sys/wait.h>
+#endif
 #include <fcntl.h>
 #include <stdlib.h>
 
@@ -1160,7 +1162,7 @@ g_file_replace (const gchar *filename,
 	{
           gchar *display_filename = g_filename_display_name (filename);
 
-	  save_errno = errno;
+	  int save_errno = errno;
 	  
 	  g_set_error (error,
 		       G_FILE_ERROR,
diff --git a/glib/gutils.h b/glib/gutils.h
index 020ccd315..4bc852827 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -34,8 +34,9 @@ G_BEGIN_DECLS
 
 #ifdef G_OS_WIN32
 
-/* On native Win32, directory separator is the backslash, and search path
- * separator is the semicolon.
+/* On Win32, the canonical directory separator is the backslash, and
+ * the search path separator is the semicolon. Note that also the
+ * (forward) slash works as directory separator.
  */
 #define G_DIR_SEPARATOR '\\'
 #define G_DIR_SEPARATOR_S "\\"
@@ -131,7 +132,7 @@ G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (
 static G_CONST_RETURN gchar * G_CONST_RETURN *
 g_win32_get_system_data_dirs (void)
 {
-  return g_win32_get_system_data_dirs_for_module (&g_win32_get_system_data_dirs);
+  return g_win32_get_system_data_dirs_for_module ((gconstpointer) &g_win32_get_system_data_dirs);
 }
 #define g_get_system_data_dirs g_win32_get_system_data_dirs
 #endif