Fix a memleak

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

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 1a422c7..6967b14 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -1,7 +1,11 @@
-/* glibconfig.h.win32.in Merged from two versions generated by configure for gcc and MSVC.  */
+/* glibconfig.h.win32.in. Originally merged from two versions of
+ * glibconfig.h, generated by the GLib configure script, for gcc and
+ * MSVC.
+ */
+
 /* glibconfig.h
  *
- * This is a generated file.  Please modify 'configure.in'
+ * This is a generated file.  Please modify 'glibconfig.h.win32.in'
  */
 
 #ifndef __G_LIBCONFIG_H__
@@ -102,6 +106,11 @@ typedef gint64 goffset;
 #define G_MINOFFSET    G_MININT64
 #define G_MAXOFFSET    G_MAXINT64
 
+#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
+#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
+#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
+
+
 #ifndef _WIN64
 
 #define GPOINTER_TO_INT(p)     ((gint)   (p))
@@ -200,7 +209,11 @@ typedef struct _GMutex* GStaticMutex;
 typedef union _GSystemThread GSystemThread;
 union _GSystemThread
 {
+#ifndef _WIN64
   char   data[4];
+#else
+  char   data[8];
+#endif
   double dummy_double;
   void  *dummy_pointer;
   long   dummy_long;
@@ -226,6 +239,10 @@ union _GSystemThread
 #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 GSIZE_TO_LE(val)       ((gsize) GUINT32_TO_LE (val))
+#define GSSIZE_TO_LE(val)      ((gssize) GINT32_TO_LE (val))
+#define GSIZE_TO_BE(val)       ((gsize) GUINT32_TO_BE (val))
+#define GSSIZE_TO_BE(val)      ((gssize) GINT32_TO_BE (val))
 #define G_BYTE_ORDER G_LITTLE_ENDIAN
 
 #define GLIB_SYSDEF_POLLIN =1
@@ -237,8 +254,23 @@ union _GSystemThread
 
 #define G_MODULE_SUFFIX "dll"
 
+/* A GPid is an abstraction for a process "handle". It is *not* an
+ * abstraction for a process identifier in general. GPid is used in
+ * GLib only for descendant processes spawned with the g_spawn*
+ * functions. On POSIX there is no "process handle" concept as such,
+ * but on Windows a GPid is a handle to a process, a kind of pointer,
+ * not a process identifier.
+ */
 typedef void * GPid;
 
+#define GLIB_SYSDEF_AF_UNIX 1
+#define GLIB_SYSDEF_AF_INET 2
+#define GLIB_SYSDEF_AF_INET6 23
+
+#define GLIB_SYSDEF_MSG_OOB       1
+#define GLIB_SYSDEF_MSG_PEEK      2
+#define GLIB_SYSDEF_MSG_DONTROUTE 4
+
 G_END_DECLS
 
 #endif /* GLIBCONFIG_H */