Plug mem leaks in parse_value_from_blob

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

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index a37a948..fbac9d2 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__
@@ -64,6 +68,24 @@ typedef unsigned __int64 guint64;
 #define G_GINT64_FORMAT "I64i"
 #define G_GUINT64_FORMAT "I64u"
 
+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
+
+#define GLIB_SIZEOF_VOID_P 8
+#define GLIB_SIZEOF_LONG   4
+#define GLIB_SIZEOF_SIZE_T 8
+
+typedef signed long long gssize;
+typedef unsigned long long gsize;
+#define G_GSIZE_MODIFIER "I64"
+#define G_GSSIZE_FORMAT "I64d"
+#define G_GSIZE_FORMAT "I64u"
+
+#define G_MAXSIZE      G_MAXUINT64
+#define G_MINSSIZE     G_MININT64
+#define G_MAXSSIZE     G_MAXINT64
+
+#else
+
 #define GLIB_SIZEOF_VOID_P 4
 #define GLIB_SIZEOF_LONG   4
 #define GLIB_SIZEOF_SIZE_T 4
@@ -78,10 +100,18 @@ typedef unsigned int gsize;
 #define G_MINSSIZE     G_MININT
 #define G_MAXSSIZE     G_MAXINT
 
+#endif
+
 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))
 #define GPOINTER_TO_UINT(p)    ((guint)  (p))
@@ -89,6 +119,35 @@ typedef gint64 goffset;
 #define GINT_TO_POINTER(i)     ((gpointer)  (i))
 #define GUINT_TO_POINTER(u)    ((gpointer)  (u))
 
+typedef signed int gintptr;
+typedef unsigned int guintptr;
+
+#define G_GINTPTR_MODIFIER      ""
+#define G_GINTPTR_FORMAT        "i"
+#define G_GUINTPTR_FORMAT       "u"
+
+#else
+
+#define GPOINTER_TO_INT(p)     ((gint)  (gint64) (p))
+#define GPOINTER_TO_UINT(p)    ((guint) (guint64) (p))
+
+#define GINT_TO_POINTER(i)     ((gpointer) (gint64) (i))
+#define GUINT_TO_POINTER(u)    ((gpointer) (guint64) (u))
+
+#ifndef _MSC_VER
+typedef signed long long gintptr;
+typedef unsigned long long guintptr;
+#else
+typedef signed __int64 gintptr;
+typedef unsigned __int64 guintptr;
+#endif
+
+#define G_GINTPTR_MODIFIER      "I64"
+#define G_GINTPTR_FORMAT        "I64i"
+#define G_GUINTPTR_FORMAT       "I64u"
+
+#endif
+
 #ifdef NeXT /* @#%@! NeXTStep */
 # define g_ATEXIT(proc)        (!atexit (proc))
 #else
@@ -158,7 +217,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;
@@ -184,6 +247,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
@@ -195,8 +262,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 */