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.

diff --git a/ChangeLog b/ChangeLog
index 902b12a..ce0338d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-15  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Slight update to match what is currently
+       produced by configure.
+
 Sat Dec 14 21:24:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 902b12a..ce0338d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-12-15  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Slight update to match what is currently
+       produced by configure.
+
 Sat Dec 14 21:24:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 902b12a..ce0338d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-12-15  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Slight update to match what is currently
+       produced by configure.
+
 Sat Dec 14 21:24:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 902b12a..ce0338d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-12-15  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Slight update to match what is currently
+       produced by configure.
+
 Sat Dec 14 21:24:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 902b12a..ce0338d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-12-15  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Slight update to match what is currently
+       produced by configure.
+
 Sat Dec 14 21:24:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 902b12a..ce0338d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-12-15  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Slight update to match what is currently
+       produced by configure.
+
 Sat Dec 14 21:24:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 902b12a..ce0338d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-12-15  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Slight update to match what is currently
+       produced by configure.
+
 Sat Dec 14 21:24:04 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gutils.c (g_get_any_init): HP-UX 10 xshares the

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 845ae67..533e687 100644 (file)
--- 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"