Move the G_BEGIN_DECLS/G_END_DECLS pair outside the #if/#else/#endif

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

	* glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside
	the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without
	matching G_END_DECLS on Unix, and G_END_DECLS without matching
	G_BEGIN_DECLS on Win32.

diff --git a/ChangeLog b/ChangeLog
index 171e3e9..2cc8fcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-04  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside
+       the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without
+       matching G_END_DECLS on Unix, and G_END_DECLS without matching
+       G_BEGIN_DECLS on Win32.
+
 2005-08-03  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 171e3e9..2cc8fcc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-08-04  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside
+       the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without
+       matching G_END_DECLS on Unix, and G_END_DECLS without matching
+       G_BEGIN_DECLS on Win32.
+
 2005-08-03  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 171e3e9..2cc8fcc 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2005-08-04  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside
+       the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without
+       matching G_END_DECLS on Unix, and G_END_DECLS without matching
+       G_BEGIN_DECLS on Win32.
+
 2005-08-03  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 171e3e9..2cc8fcc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-08-04  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gstdio.h: Move the G_BEGIN_DECLS/G_END_DECLS pair outside
+       the #if/#else/#endif block. Otherwise we had G_BEGIN_DECLS without
+       matching G_END_DECLS on Unix, and G_END_DECLS without matching
+       G_BEGIN_DECLS on Win32.
+
 2005-08-03  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/glib/gstdio.h b/glib/gstdio.h
index 8b134af..047b504 100644 (file)
--- a/glib/gstdio.h
+++ b/glib/gstdio.h
@@ -25,10 +25,10 @@
 
 #include <sys/stat.h>
 
-#if defined(G_OS_UNIX) && !defined(G_STDIO_NO_WRAP_ON_UNIX)
-
 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.
  */
@@ -100,8 +100,8 @@ FILE *g_freopen (const gchar *filename,
                  const gchar *mode,
                  FILE        *stream);
 
-G_END_DECLS
-
 #endif /* G_OS_UNIX */
 
+G_END_DECLS
+
 #endif /* __G_STDIO_H__ */