glib r7288 - trunk

[tml svn gnome org]

Author: tml
Date: Sat Aug  2 11:21:14 2008
New Revision: 7288
URL: http://svn.gnome.org/viewvc/glib?rev=7288&view=rev

Log:
2008-08-02  Tor Lillqvist  <tml novell com>

	* glibconfig.h.win32.in: Add 64-bit versions of
	GPOINTER_TO_INT(), GPOINTER_TO_UINT() and vice versa, too.



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	Sat Aug  2 11:21:14 2008
@@ -102,6 +102,7 @@
 #define G_MINOFFSET	G_MININT64
 #define G_MAXOFFSET	G_MAXINT64
 
+#ifndef _WIN64
 
 #define GPOINTER_TO_INT(p)	((gint)   (p))
 #define GPOINTER_TO_UINT(p)	((guint)  (p))
@@ -109,10 +110,17 @@
 #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
+
+#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;
@@ -120,6 +128,7 @@
 typedef signed __int64 gintptr;
 typedef unsigned __int64 guintptr;
 #endif
+
 #endif
 
 #ifdef NeXT /* @#% ! NeXTStep */