Update an example from 1.3 to 2.x

[platform/upstream/glib.git] / glibconfig.h.win32.in

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 704b691..ec0b87a 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -8,7 +8,6 @@
 #define __G_LIBCONFIG_H__
 
 #include <glib/gmacros.h>
-
 #include <limits.h>
 #include <float.h>
 
@@ -28,10 +27,6 @@ G_BEGIN_DECLS
 #define G_MAXLONG      LONG_MAX
 #define G_MAXULONG     ULONG_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;
 typedef signed short gint16;
@@ -59,9 +54,9 @@ typedef unsigned __int64 guint64;
 #else /* _MSC_VER */
 #define G_GINT64_CONSTANT(val) (val##i64)
 #endif /* _MSC_VER */
-#define G_GINT64_MODIFIER "ll"
-#define G_GINT64_FORMAT "lli"
-#define G_GUINT64_FORMAT "llu"
+#define G_GINT64_MODIFIER "I64"
+#define G_GINT64_FORMAT "I64i"
+#define G_GUINT64_FORMAT "I64u"
 
 #define GLIB_SIZEOF_VOID_P 4
 #define GLIB_SIZEOF_LONG   4
@@ -69,6 +64,11 @@ typedef unsigned __int64 guint64;
 
 typedef signed int gssize;
 typedef unsigned int gsize;
+#define G_GSIZE_MODIFIER ""
+#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))
@@ -130,18 +130,14 @@ typedef unsigned int gsize;
 #define G_HAVE_GROWING_STACK 0
 
 
+#define G_GNUC_INTERNAL
+
 #define G_THREADS_ENABLED
 #define G_THREADS_IMPL_WIN32
 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
@@ -186,6 +182,8 @@ union _GSystemThread
 
 #define G_MODULE_SUFFIX "dll"
 
+typedef void * GPid;
+
 G_END_DECLS
 
 #endif /* GLIBCONFIG_H */