From 59137b99237bf2f5a865591363e873fb6e4cf9de Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 2 Aug 2008 08:51:27 +0000 Subject: [PATCH] Add gintptr and guintptr typedefs here, too, appropriately ifdeffed for 2008-08-02 Tor Lillqvist * glibconfig.h.win32.in: Add gintptr and guintptr typedefs here, too, appropriately ifdeffed for 32/64 bit, gcc/MSVC. svn path=/trunk/; revision=7287 --- ChangeLog | 5 +++++ glibconfig.h.win32.in | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 42ab3e321..a6d73a879 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-02 Tor Lillqvist + + * glibconfig.h.win32.in: Add gintptr and guintptr typedefs here, + too, appropriately ifdeffed for 32/64 bit, gcc/MSVC. + 2008-08-01 Matthias Clasen * NEWS: Updates diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index 426c582e6..91ae235fe 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -109,6 +109,19 @@ typedef gint64 goffset; #define GINT_TO_POINTER(i) ((gpointer) (i)) #define GUINT_TO_POINTER(u) ((gpointer) (u)) +#ifndef _WIN64 +typedef signed int gintptr; +typedef unsigned int guintptr; +#else +#ifndef _MSC_VER +typedef signed long long gintptr; +typedef unsigned long long guintptr; +#else +typedef signed __int64 gintptr; +typedef unsigned __int64 guintptr; +#endif +#endif + #ifdef NeXT /* @#%@! NeXTStep */ # define g_ATEXIT(proc) (!atexit (proc)) #else