diff --git a/ChangeLog b/ChangeLog index 97a91fa75..3bc409aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-03-03 Tor Lillqvist + * glibconfig.h.win32.in: Update to match a configure-generated + glibconfig.h. Specifically: Remove G_{MIN,MAX,MAXU}INT64 + definitions (now in gtypes.h). Remove g_once and + g_static_mutex_get_mutex_impl_shortcut definitions (now in + gthread.h). + * tests/child-test.c: Use a macro GPID_FORMAT for the format to print GPid in (%p on Win32, %d on Unix). Maybe configure.in should place that in glibconfig.h? diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 97a91fa75..3bc409aa4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2004-03-03 Tor Lillqvist + * glibconfig.h.win32.in: Update to match a configure-generated + glibconfig.h. Specifically: Remove G_{MIN,MAX,MAXU}INT64 + definitions (now in gtypes.h). Remove g_once and + g_static_mutex_get_mutex_impl_shortcut definitions (now in + gthread.h). + * tests/child-test.c: Use a macro GPID_FORMAT for the format to print GPid in (%p on Win32, %d on Unix). Maybe configure.in should place that in glibconfig.h? diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 97a91fa75..3bc409aa4 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,11 @@ 2004-03-03 Tor Lillqvist + * glibconfig.h.win32.in: Update to match a configure-generated + glibconfig.h. Specifically: Remove G_{MIN,MAX,MAXU}INT64 + definitions (now in gtypes.h). Remove g_once and + g_static_mutex_get_mutex_impl_shortcut definitions (now in + gthread.h). + * tests/child-test.c: Use a macro GPID_FORMAT for the format to print GPid in (%p on Win32, %d on Unix). Maybe configure.in should place that in glibconfig.h? diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 97a91fa75..3bc409aa4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,11 @@ 2004-03-03 Tor Lillqvist + * glibconfig.h.win32.in: Update to match a configure-generated + glibconfig.h. Specifically: Remove G_{MIN,MAX,MAXU}INT64 + definitions (now in gtypes.h). Remove g_once and + g_static_mutex_get_mutex_impl_shortcut definitions (now in + gthread.h). + * tests/child-test.c: Use a macro GPID_FORMAT for the format to print GPid in (%p on Win32, %d on Unix). Maybe configure.in should place that in glibconfig.h? diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 97a91fa75..3bc409aa4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,11 @@ 2004-03-03 Tor Lillqvist + * glibconfig.h.win32.in: Update to match a configure-generated + glibconfig.h. Specifically: Remove G_{MIN,MAX,MAXU}INT64 + definitions (now in gtypes.h). Remove g_once and + g_static_mutex_get_mutex_impl_shortcut definitions (now in + gthread.h). + * tests/child-test.c: Use a macro GPID_FORMAT for the format to print GPid in (%p on Win32, %d on Unix). Maybe configure.in should place that in glibconfig.h? diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 97a91fa75..3bc409aa4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,11 @@ 2004-03-03 Tor Lillqvist + * glibconfig.h.win32.in: Update to match a configure-generated + glibconfig.h. Specifically: Remove G_{MIN,MAX,MAXU}INT64 + definitions (now in gtypes.h). Remove g_once and + g_static_mutex_get_mutex_impl_shortcut definitions (now in + gthread.h). + * tests/child-test.c: Use a macro GPID_FORMAT for the format to print GPid in (%p on Win32, %d on Unix). Maybe configure.in should place that in glibconfig.h? diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index e8295c4b1..84ddda2dc 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -27,11 +27,6 @@ G_BEGIN_DECLS #define G_MINLONG LONG_MIN #define G_MAXLONG LONG_MAX #define G_MAXULONG ULONG_MAX -#define G_MAXSIZE UINT_MAX - -#define G_MININT64 G_GINT64_CONSTANT(0x8000000000000000) -#define G_MAXINT64 G_GINT64_CONSTANT(0x7fffffffffffffff) -#define G_MAXUINT64 G_GINT64_CONSTANT(0xffffffffffffffffU) typedef signed char gint8; typedef unsigned char guint8; @@ -74,6 +69,8 @@ typedef unsigned int gsize; #define G_GSSIZE_FORMAT "i" #define G_GSIZE_FORMAT "u" +#define G_MAXSIZE G_MAXUINT + #define GPOINTER_TO_INT(p) ((gint) (p)) #define GPOINTER_TO_UINT(p) ((guint) (p)) @@ -140,12 +137,6 @@ typedef struct _GMutex* GStaticMutex; #define G_STATIC_MUTEX_INIT NULL #define g_static_mutex_get_mutex(mutex) \ (g_static_mutex_get_mutex_impl_shortcut (mutex)) -/* double checked locking can be used on this platform */ -#define g_once(once, func, arg) \ - ((once)->status == G_ONCE_STATUS_READY ? (once)->retval : \ - g_once_impl (once, func, arg)); -#define g_static_mutex_get_mutex_impl_shortcut(mutex) \ - (*(mutex) ? *(mutex) : g_static_mutex_get_mutex_impl (mutex)) /* This represents a system thread as used by the implementation. An * alien implementaion, as loaded by g_thread_init can only count on * "sizeof (gpointer)" bytes to store their info. We however need more @@ -190,7 +181,7 @@ union _GSystemThread #define G_MODULE_SUFFIX "dll" -typedef void* GPid; +typedef void * GPid; G_END_DECLS