summaryrefslogtreecommitdiff
path: root/glibconfig.h.win32.in
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-08-02 08:51:27 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-08-02 08:51:27 +0000
commit59137b99237bf2f5a865591363e873fb6e4cf9de (patch)
treeff8ac7033ac2cc199f670171b488c788d7452397 /glibconfig.h.win32.in
parent302111f89a08064628792f2663f8e6fcb577c0f4 (diff)
downloadglib-59137b99237bf2f5a865591363e873fb6e4cf9de.tar.gz
Add gintptr and guintptr typedefs here, too, appropriately ifdeffed for
2008-08-02 Tor Lillqvist <tml@novell.com> * glibconfig.h.win32.in: Add gintptr and guintptr typedefs here, too, appropriately ifdeffed for 32/64 bit, gcc/MSVC. svn path=/trunk/; revision=7287
Diffstat (limited to 'glibconfig.h.win32.in')
-rw-r--r--glibconfig.h.win32.in13
1 files changed, 13 insertions, 0 deletions
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