summaryrefslogtreecommitdiff
path: root/glibconfig.h.win32.in
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2002-12-15 05:37:52 +0000
committerTor Lillqvist <tml@src.gnome.org>2002-12-15 05:37:52 +0000
commitde8234dde0ecb6055a81e000e843c3c071306f43 (patch)
treead4362e10f39e96a3dcb67d4359f1ab59b0e70df /glibconfig.h.win32.in
parent42f04422b06c094a71ea194e77609dfae55fc5c5 (diff)
downloadglib-de8234dde0ecb6055a81e000e843c3c071306f43.tar.gz
Slight update to match what is currently produced by configure.
2002-12-15 Tor Lillqvist <tml@iki.fi> * config.h.win32.in: Slight update to match what is currently produced by configure.
Diffstat (limited to 'glibconfig.h.win32.in')
-rw-r--r--glibconfig.h.win32.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 845ae6733..533e687cc 100644
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -72,7 +72,6 @@ typedef unsigned int gsize;
#define GINT_TO_POINTER(i) ((gpointer) (i))
#define GUINT_TO_POINTER(u) ((gpointer) (u))
-
#ifdef NeXT /* @#%@! NeXTStep */
# define g_ATEXIT(proc) (!atexit (proc))
#else
@@ -88,7 +87,9 @@ typedef unsigned int gsize;
#define G_OS_WIN32
#define G_PLATFORM_WIN32
-
+#ifndef _MSC_VER
+#define G_VA_COPY va_copy
+#endif /* not _MSC_VER */
#ifdef __cplusplus
#define G_HAVE_INLINE 1
@@ -108,6 +109,9 @@ typedef unsigned int gsize;
#ifndef __cplusplus
# define G_HAVE_ISO_VARARGS 1
#endif
+#ifdef __cplusplus
+# define G_HAVE_ISO_VARARGS 1
+#endif
/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
* is passed ISO vararg support is turned off, and there is no work
@@ -165,8 +169,8 @@ union _GSystemThread
#define GLIB_SYSDEF_POLLIN =1
#define GLIB_SYSDEF_POLLOUT =4
#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLERR =8
#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLERR =8
#define GLIB_SYSDEF_POLLNVAL =32
#define G_MODULE_SUFFIX "dll"