From 52ad8a9c2ae74e2f3f265f5d3f0ac638305d8086 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 12 Oct 1999 20:46:13 +0000 Subject: [PATCH] Define the new GLIB_SIZEOF_* constants here, too. 1999-10-12 Tor Lillqvist * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here, too. * glib.h: Small Win32 comments improvement. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ config.h.win32.in | 6 +++++- glib.h | 7 ++++++- glib/glib.h | 7 ++++++- 11 files changed, 73 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fb9c4a568..0d4652ab1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +1999-10-12 Tor Lillqvist + + * 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 * gmessages.c (g_printf_string_upper_bound): completly new implementation diff --git a/config.h.win32.in b/config.h.win32.in index 2a0773791..c4c1d6db4 100644 --- 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 64670120b..1eac04ab2 100644 --- a/glib.h +++ b/glib.h @@ -2836,7 +2836,8 @@ typedef int pid_t; * unlink: or * open, read, write, lseek, close: * rmdir: - * pipe: */ + * pipe: + */ /* 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 64670120b..1eac04ab2 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -2836,7 +2836,8 @@ typedef int pid_t; * unlink: or * open, read, write, lseek, close: * rmdir: - * pipe: */ + * pipe: + */ /* 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