From 8d4242580e948d2a447bdd8deb5eb11f33846afd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 23 Jul 2008 21:05:16 +0000 Subject: [PATCH] Patch for 64-bit Windows from Richard Hult. 2008-07-24 Tor Lillqvist * glibconfig.h.win32.in: Patch for 64-bit Windows from Richard Hult. svn path=/trunk/; revision=7245 --- ChangeLog | 5 +++++ glibconfig.h.win32.in | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index f17ef19a..d0677969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-24 Tor Lillqvist + + * glibconfig.h.win32.in: Patch for 64-bit Windows from Richard + Hult. + 2008-07-23 Matthias Clasen 544088 – option_test_LDADD is left in tests/Makefile.am diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index a37a948e..6bb0db6d 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -64,6 +64,24 @@ typedef unsigned __int64 guint64; #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 @@ 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 -- 2.34.1