[svn] pinentry - r182 - in trunk: . gtk+-2

[svn author marcus]

Author: marcus
Date: 2008-05-05 01:24:28 +0200 (Mon, 05 May 2008)
New Revision: 182

Modified:
   trunk/ChangeLog
   trunk/gtk+-2/gtksecentry.c
Log:
2008-05-05  Marcus Brinkmann  <marcus at ulysses.g10code.com>

	* gtk+-2/gtksecentry.c (GMALLOC_SIZE): New symbol.
	(g_malloc, g_malloc0, g_realloc): Use GMALLOC_SIZE instead of
	gulong for size attribute.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-03 14:20:29 UTC (rev 181)
+++ trunk/ChangeLog	2008-05-04 23:24:28 UTC (rev 182)
@@ -1,3 +1,9 @@
+2008-05-05  Marcus Brinkmann  <marcus at ulysses.g10code.com>
+
+	* gtk+-2/gtksecentry.c (GMALLOC_SIZE): New symbol.
+	(g_malloc, g_malloc0, g_realloc): Use GMALLOC_SIZE instead of
+	gulong for size attribute.
+
 2008-03-03  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gtk+-2/pinentry-gtk-2.c (create_window): Install realize callback.

Modified: trunk/gtk+-2/gtksecentry.c
===================================================================
--- trunk/gtk+-2/gtksecentry.c	2008-03-03 14:20:29 UTC (rev 181)
+++ trunk/gtk+-2/gtksecentry.c	2008-05-04 23:24:28 UTC (rev 182)
@@ -269,8 +269,14 @@
 				} while(0)
 
 
+#if GLIB_CHECK_VERSION (2,15,5)
+GMALLOC_SIZE gsize
+#else
+GMALLOC_SIZE gulong
+#endif
+
 gpointer
-g_malloc(gulong size)
+g_malloc (GMALLOC_SIZE size)
 {
     gpointer p;
 
@@ -288,7 +294,7 @@
 }
 
 gpointer
-g_malloc0(gulong size)
+g_malloc0 (GMALLOC_SIZE size)
 {
     gpointer p;
 
@@ -308,7 +314,7 @@
 }
 
 gpointer
-g_realloc(gpointer mem, gulong size)
+g_realloc (gpointer mem, GMALLOC_SIZE size)
 {
     gpointer p;