glib r7245 - trunk

[tml svn gnome org]

Author: tml
Date: Wed Jul 23 21:05:16 2008
New Revision: 7245
URL: http://svn.gnome.org/viewvc/glib?rev=7245&view=rev

Log:
2008-07-24  Tor Lillqvist  <tml novell com>

	* glibconfig.h.win32.in: Patch for 64-bit Windows from Richard
	Hult.



Modified:
   trunk/ChangeLog
   trunk/glibconfig.h.win32.in

Modified: trunk/glibconfig.h.win32.in
==============================================================================
--- trunk/glibconfig.h.win32.in	(original)
+++ trunk/glibconfig.h.win32.in	Wed Jul 23 21:05:16 2008
@@ -64,6 +64,24 @@
 #define G_GINT64_FORMAT "I64i"
 #define G_GUINT64_FORMAT "I64u"
 
+#if 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,6 +96,8 @@
 #define G_MINSSIZE	G_MININT
 #define G_MAXSSIZE	G_MAXINT
 
+#endif
+
 typedef gint64 goffset;
 #define G_MINOFFSET	G_MININT64
 #define G_MAXOFFSET	G_MAXINT64