Don't provide g_rmdir() as a macro expanding to rmdir, since rmdir is not

2006-01-02  Matthias Clasen  <mclasen@redhat.com>

	* glib/glib.symbols:
	* glib/gstdio.h:
	* glib/gstdio.c (g_rmdir): Don't provide g_rmdir() as a macro
	expanding to rmdir, since rmdir is not declared in a portable
	system header we can include in gstdio.h.  (#325249, Jani Monoses)

diff --git a/ChangeLog b/ChangeLog
index 3ebe056..6fd5286 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: 
+       * glib/gstdio.h: 
+       * glib/gstdio.c (g_rmdir): Don't provide g_rmdir() as a macro
+       expanding to rmdir, since rmdir is not declared in a portable
+       system header we can include in gstdio.h.  (#325249, Jani Monoses)
+
 2006-01-01  Tor Lillqvist  <tml@novell.com>
 
        * glib/gspawn-win32.c (g_spawn_sync_utf8): Set the GIOChannels for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3ebe056..6fd5286 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: 
+       * glib/gstdio.h: 
+       * glib/gstdio.c (g_rmdir): Don't provide g_rmdir() as a macro
+       expanding to rmdir, since rmdir is not declared in a portable
+       system header we can include in gstdio.h.  (#325249, Jani Monoses)
+
 2006-01-01  Tor Lillqvist  <tml@novell.com>
 
        * glib/gspawn-win32.c (g_spawn_sync_utf8): Set the GIOChannels for

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3ebe056..6fd5286 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2006-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: 
+       * glib/gstdio.h: 
+       * glib/gstdio.c (g_rmdir): Don't provide g_rmdir() as a macro
+       expanding to rmdir, since rmdir is not declared in a portable
+       system header we can include in gstdio.h.  (#325249, Jani Monoses)
+
 2006-01-01  Tor Lillqvist  <tml@novell.com>
 
        * glib/gspawn-win32.c (g_spawn_sync_utf8): Set the GIOChannels for

diff --git a/glib/glib.symbols b/glib/glib.symbols
index fb65129..d0858a9 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -931,10 +931,10 @@ g_stat
 g_lstat
 g_unlink
 g_remove
-g_rmdir
 g_fopen
 g_freopen
 #endif
+g_rmdir
 #endif
 #endif
 

diff --git a/glib/gstdio.h b/glib/gstdio.h
index 047b504..8dbe4af 100644 (file)
--- a/glib/gstdio.h
+++ b/glib/gstdio.h
@@ -30,7 +30,9 @@ G_BEGIN_DECLS
 #if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
 
 /* Just pass on to the system functions, so there's no potential for data
- * format mismatches, especially with large file interfaces.
+ * format mismatches, especially with large file interfaces. 
+ * rmdir() can't be handled in this way, since it is not defined in 
+ * a portable system header that we could include here.
  */
 
 #define g_access  access
@@ -44,10 +46,11 @@ G_BEGIN_DECLS
 #define g_lstat   lstat
 #define g_unlink  unlink
 #define g_remove  remove
-#define g_rmdir   rmdir
 #define g_fopen   fopen
 #define g_freopen freopen
 
+int g_rmdir (const gchar *filename);
+
 #else /* ! G_OS_UNIX */
 
 /* Wrappers for C library functions that take pathname arguments. On
@@ -91,7 +94,7 @@ int g_unlink    (const gchar *filename);
 
 int g_remove    (const gchar *filename);
 
-int g_rmdir (const gchar *filename);
+int g_rmdir     (const gchar *filename);
 
 FILE *g_fopen   (const gchar *filename,
                  const gchar *mode);