gtk+ r20987 - in trunk: . gdk

[tml svn gnome org]

Author: tml
Date: Mon Aug  4 22:26:26 2008
New Revision: 20987
URL: http://svn.gnome.org/viewvc/gtk+?rev=20987&view=rev

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

	* gdk/gdkrgb.c: Cast pointers to guintptr, not unsigned long,
	before doing bit tests on them.



Modified:
   trunk/ChangeLog
   trunk/gdk/gdkrgb.c

Modified: trunk/gdk/gdkrgb.c
==============================================================================
--- trunk/gdk/gdkrgb.c	(original)
+++ trunk/gdk/gdkrgb.c	Mon Aug  4 22:26:26 2008
@@ -862,7 +862,7 @@
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
 	{
 	  for (x = 0; x < width; x++)
 	    {
@@ -1495,7 +1495,7 @@
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
 	{
 	  for (x = 0; x < width; x++)
 	    {
@@ -1626,7 +1626,7 @@
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
 	{
 	  for (x = 0; x < width; x++)
 	    {
@@ -1768,7 +1768,7 @@
       const guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT);
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
 	{
 	  for (x = x_align; x < width; x++)
 	    {
@@ -2030,7 +2030,7 @@
     {
       bp2 = bptr;
       obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
+      if (((guintptr)obuf | (guintptr) bp2) & 3)
 	{
 	  for (x = 0; x < width; x++)
 	    {