diff --git a/ChangeLog b/ChangeLog
index 42ab3e321..a6d73a879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2008-08-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* 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