[Emacs-diffs] Changes to emacs/src/xterm.c,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/05/26 11:37:43

Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -b -r1.993 -r1.994
--- xterm.c     25 May 2008 11:14:31 -0000      1.993
+++ xterm.c     26 May 2008 11:37:42 -0000      1.994
@@ -469,7 +469,7 @@
   Window win = FRAME_OUTER_WINDOW (f);
   double alpha = 1.0;
   double alpha_min = 1.0;
-  unsigned int opac;
+  unsigned long opac;
   
   if (FRAME_X_DISPLAY_INFO (f)->root_window != FRAME_X_OUTPUT (f)->parent_desc)
     /* Since the WM decoration lies under the FRAME_OUTER_WINDOW,
@@ -491,7 +491,7 @@
   else if (0.0 <= alpha && alpha < alpha_min && alpha_min <= 1.0)
     alpha = alpha_min;
 
-  opac = (unsigned int)(alpha * OPAQUE);
+  opac = alpha * OPAQUE;
 
   /* return unless necessary */
   {
@@ -502,9 +502,9 @@
 
     XGetWindowProperty(dpy, win, XInternAtom(dpy, OPACITY, False),
                       0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left,
-                      (unsigned char **) &data);
-    if (data != None)
-      if (*(unsigned int *)data == opac)
+                      &data);
+    if (actual != None)
+      if (*(unsigned long *)data == opac)
        {
          XFree ((void *) data);
          return;