Define the new GLIB_SIZEOF_* constants here, too.

1999-10-12  Tor Lillqvist  <tml@iki.fi>

* config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
too.

* glib.h: Small Win32 comments improvement.

diff --git a/ChangeLog b/ChangeLog
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fb9c4a5682662b0eddee7c359d06d5b780df139e..0d4652ab1646685f157a5e84b40452843a9ddc85 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+1999-10-12  Tor Lillqvist  <tml@iki.fi>
+
+       * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,
+       too.
+
+       * glib.h: Small Win32 comments improvement.
+
 Tue Oct 12 12:16:12 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_printf_string_upper_bound): completly new implementation

diff --git a/config.h.win32.in b/config.h.win32.in
index 2a07737912c7e6b673599d90396b6e4b7754f809..c4c1d6db4a0cdbd418a61dc03ff1088c3e813db1 100644 (file)
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -61,6 +61,10 @@
 #define GLIB_BINARY_AGE @GLIB_BINARY_AGE@
 
 #define GLIB_SIZEOF_PTHREAD_T 4
+#define GLIB_SIZEOF_SIZE_T 4
+#define GLIB_SIZEOF_PTRDIFF_T 4
+#define GLIB_SIZEOF_INTMAX_T 4
+
 #define POSIX_MIN_PRIORITY -2
 #define POSIX_MAX_PRIORITY 2
 #define POSIX_YIELD_FUNC Sleep(0)
@@ -98,7 +102,7 @@
 /* #undef HAVE_ON_EXIT */
 
 /* Define if you have the strcasecmp function.  */
-/* #undef HAVE_STRCASECMP ^*/
+/* #undef HAVE_STRCASECMP */
 
 /* Define if you have the strerror function.  */
 #define HAVE_STRERROR 1

diff --git a/glib.h b/glib.h
index 64670120b258e960d19d544578873795a2bccc94..1eac04ab206d11e690a80c2678b5ab33ea5ade74 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -2836,7 +2836,8 @@ typedef int pid_t;
  * unlink: <stdio.h> or <io.h>
  * open, read, write, lseek, close: <io.h>
  * rmdir: <direct.h>
- * pipe: <direct.h> */
+ * pipe: <direct.h>
+ */
 
 /* pipe is not in OLDNAMES.LIB or -lmoldname-msvc. */
 #define pipe(phandles) _pipe (phandles, 4096, _O_BINARY)
@@ -2845,6 +2846,10 @@ typedef int pid_t;
  * we provide emulators in glib, which are prefixed with gwin_.
  */
 #    define ftruncate(fd, size)        gwin_ftruncate (fd, size)
+
+/* -lmingw32 also has emulations for these, but we need our own
+ * for MSVC anyhow, so we might aswell use them always.
+ */
 #    define opendir            gwin_opendir
 #    define readdir            gwin_readdir
 #    define rewinddir          gwin_rewinddir

diff --git a/glib/glib.h b/glib/glib.h
index 64670120b258e960d19d544578873795a2bccc94..1eac04ab206d11e690a80c2678b5ab33ea5ade74 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -2836,7 +2836,8 @@ typedef int pid_t;
  * unlink: <stdio.h> or <io.h>
  * open, read, write, lseek, close: <io.h>
  * rmdir: <direct.h>
- * pipe: <direct.h> */
+ * pipe: <direct.h>
+ */
 
 /* pipe is not in OLDNAMES.LIB or -lmoldname-msvc. */
 #define pipe(phandles) _pipe (phandles, 4096, _O_BINARY)
@@ -2845,6 +2846,10 @@ typedef int pid_t;
  * we provide emulators in glib, which are prefixed with gwin_.
  */
 #    define ftruncate(fd, size)        gwin_ftruncate (fd, size)
+
+/* -lmingw32 also has emulations for these, but we need our own
+ * for MSVC anyhow, so we might aswell use them always.
+ */
 #    define opendir            gwin_opendir
 #    define readdir            gwin_readdir
 #    define rewinddir          gwin_rewinddir