luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 64-bit versions of GPOINTER_TO_INT(), GPOINTER_TO_UINT() and vice

Browse Source 
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.


svn path=/trunk/; revision=7288
This commit is contained in:
Tor Lillqvist 2008-08-02 11:21:14 +00:00 committed by Tor Lillqvist
parent 59137b9923
commit e4194cb055
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,8 +1,10 @@
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.
too, appropriately ifdeffed for 32/64 bit, gcc/MSVC. Add 64-bit
versions of GPOINTER_TO_INT(), GPOINTER_TO_UINT() and vice versa,
too.
2008-08-01 Matthias Clasen <mclasen@redhat.com>
* NEWS: Updates

11
glibconfig.h.win32.in
View File

@ -102,6 +102,7 @@ typedef gint64 goffset;
#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 @@ 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
#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 unsigned long long guintptr;
typedef signed __int64 gintptr;
typedef unsigned __int64 guintptr;
#endif
#endif
#ifdef NeXT /* @#%@! NeXTStep */