summaryrefslogtreecommitdiff
path: root/glibconfig.h.win32.in
diff options
context:
space:
mode:
authorSebastian Wilhelmi <wilhelmi@ira.uka.de>2000-10-12 14:55:37 +0000
committerSebastian Wilhelmi <wilhelmi@src.gnome.org>2000-10-12 14:55:37 +0000
commitf70ef2aa2672471af588b489ff5a86c08e1ca41c (patch)
tree26245df13012f47a68e9ac1411d5d78f52e151ea /glibconfig.h.win32.in
parentd77b7fb0b7a33bce45855711c9ab7c3406c9f895 (diff)
downloadglib-f70ef2aa2672471af588b489ff5a86c08e1ca41c.tar.gz
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.
Diffstat (limited to 'glibconfig.h.win32.in')
-rw-r--r--glibconfig.h.win32.in18
1 files changed, 8 insertions, 10 deletions
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 968015445..bb6457f02 100644
--- 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__ */