Mercurial > hg > xemacs-beta

diff src/glyphs-msw.c @ 5936:574f0cded429 cygwin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
try to replace all nnnL or nnnUL constants with EMACS_[U]INT
author Henry Thompson <ht@markup.co.uk>
date Sun, 13 Dec 2015 13:22:58 +0000
parents e2fae7783046
children
line wrap: on
line diff
--- a/src/glyphs-msw.c	Sat Dec 12 21:49:31 2015 +0000
+++ b/src/glyphs-msw.c	Sun Dec 13 13:22:58 2015 +0000
@@ -152,7 +152,7 @@
     }
 }
 
-#define BPLINE(width) ((int)(~3UL & (unsigned long)((width) +3)))
+#define BPLINE(width) ((int)(~((EMACS_UINT)3) & (unsigned long)((width) +3)))
 
 /************************************************************************/
 /* convert from a series of RGB triples to a BITMAPINFO formated for the*/
@@ -837,7 +837,7 @@
 
   *width = xpmimage.width;
   *height = xpmimage.height;
-  maskbpline = BPLINE ((~7UL & (unsigned long)(*width + 7)) / 8);
+  maskbpline = BPLINE ((~((EMACS_UINT)7) & (unsigned long)(*width + 7)) / 8);
 
   *data = xnew_array_and_zero (Binbyte, *width * *height * 3);