Adapted accordingly to header separation and GLIB_HAVE_ALLOCA_H renaming.

2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glibconfig.h.win32.in: Adapted accordingly to header separation
	and GLIB_HAVE_ALLOCA_H renaming.

diff --git a/ChangeLog b/ChangeLog
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8c54e9f..d2d1e44 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
+       * glibconfig.h.win32.in: Adapted accordingly to header separation
+       and GLIB_HAVE_ALLOCA_H renaming.
+
        * Makefile.am: Added the new headers to glibinclude_HEADERS.
 
        * glib.h: Forgot to include gerror.h.

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 9680154..bb6457f 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -1,12 +1,10 @@
 /* glibconfig.h.win32 */
 /* Handcrafted for Microsoft C and gcc -mno-cygwin ("mingw32"). */
 
-#ifndef GLIBCONFIG_H
-#define GLIBCONFIG_H
+#ifndef __G_LIBCONFIG_H__
+#define __G_LIBCONFIG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gmacros.h>
 
 #ifdef _MSC_VER
 /* Make MSVC more pedantic, this is a recommended pragma list
@@ -52,6 +50,8 @@ extern "C" {
 #define G_MAXLONG      LONG_MAX
 #define G_MAXULONG     ULONG_MAX
 
+G_BEGIN_DECLS
+
 typedef signed char gint8;
 typedef unsigned char guint8;
 typedef signed short gint16;
@@ -95,7 +95,7 @@ typedef guint32 gsize;
 
 #define g_memmove(d,s,n) G_STMT_START { memmove ((d), (s), (n)); } G_STMT_END
 
-#define G_HAVE_ALLOCA 1
+#define GLIB_HAVE_ALLOCA_H 1
 #ifdef _MSC_VER
 #define alloca _alloca
 #endif
@@ -201,8 +201,6 @@ union _GSystemThread
 #define G_HAVE_WCHAR_H 1
 #define G_HAVE_WCTYPE_H 1
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* GLIBCONFIG_H */
+#endif /* __G_LIBCONFIG_H__ */