glib r7287 - trunk

[tml svn gnome org]

Author: tml
Date: Sat Aug  2 08:51:27 2008
New Revision: 7287
URL: http://svn.gnome.org/viewvc/glib?rev=7287&view=rev

Log:
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.



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 08:51:27 2008
@@ -109,6 +109,19 @@
 #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