Add gettext support.

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

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index e87aae4..3e31ad3 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -1,12 +1,10 @@
 /* glibconfig.h.win32 */
 /* Handcrafted for Microsoft C and gcc -mno-cygwin ("mingw32"). */
 
-#ifndef GLIBCONFIG_H
-#define GLIBCONFIG_H
+#ifndef __G_LIBCONFIG_H__
+#define __G_LIBCONFIG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gmacros.h>
 
 #ifdef _MSC_VER
 /* Make MSVC more pedantic, this is a recommended pragma list
@@ -52,6 +50,8 @@ extern "C" {
 #define G_MAXLONG      LONG_MAX
 #define G_MAXULONG     ULONG_MAX
 
+G_BEGIN_DECLS
+
 typedef signed char gint8;
 typedef unsigned char guint8;
 typedef signed short gint16;
@@ -82,6 +82,12 @@ typedef unsigned long long guint64;
 #define G_GINT64_FORMAT "I64i"
 #define G_GUINT64_FORMAT "I64u"
 
+#define GLIB_SIZEOF_VOID_P 4
+#define GLIB_SIZEOF_LONG   4
+
+typedef gint32 gssize;
+typedef guint32 gsize;
+
 #define GPOINTER_TO_INT(p)     ((gint)(p))
 #define GPOINTER_TO_UINT(p)    ((guint)(p))
 
@@ -92,11 +98,6 @@ typedef unsigned long long guint64;
 
 #define g_memmove(d,s,n) G_STMT_START { memmove ((d), (s), (n)); } G_STMT_END
 
-#define G_HAVE_ALLOCA 1
-#ifdef _MSC_VER
-#define alloca _alloca
-#endif
-
 #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@
 #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@
 #define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
@@ -147,8 +148,20 @@ struct _GStaticMutex
 #define        g_static_mutex_get_mutex(mutex) \
   (g_thread_use_default_impl ? ((GMutex*) &((mutex)->aligned_pad_u)) : \
    g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex)))
-
-#define G_BYTE_ORDER G_LITTLE_ENDIAN
+/* 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
+ * for some of our native implementations. */
+typedef union _GSystemThread GSystemThread;
+union _GSystemThread
+{
+  /* The size of the data array should be sizeof (pthread_t) */
+  /* This value corresponds to the 1999-05-30 version of pthreads-win32 */
+  char   data[4];
+  double dummy_double;
+  void  *dummy_pointer;
+  long   dummy_long;
+};
 
 #define GINT16_TO_LE(val)      ((gint16) (val))
 #define GUINT16_TO_LE(val)     ((guint16) (val))
@@ -174,6 +187,7 @@ struct _GStaticMutex
 #define GUINT_TO_LE(val)       ((guint) GUINT32_TO_LE (val))
 #define GINT_TO_BE(val)                ((gint) GINT32_TO_BE (val))
 #define GUINT_TO_BE(val)       ((guint) GUINT32_TO_BE (val))
+#define G_BYTE_ORDER G_LITTLE_ENDIAN
 
 #define GLIB_SYSDEF_POLLIN     = 1
 #define GLIB_SYSDEF_POLLOUT    = 4
@@ -182,17 +196,8 @@ struct _GStaticMutex
 #define GLIB_SYSDEF_POLLHUP    = 16
 #define GLIB_SYSDEF_POLLNVAL   = 32
 
-#define G_HAVE_WCHAR_H 1
-#define G_HAVE_WCTYPE_H 1
-
-/* Define if this is Win32, possibly using the Cygwin emulation layer. */
-#define WIN32 1
-
-/* Define if this is Win32 using the Microsoft C runtime.  */
-#define NATIVE_WIN32 1
+#define G_MODULE_SUFFIX "dll"
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* GLIBCONFIG_H */
+#endif /* __G_LIBCONFIG_H__ */