X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fxshm.c;h=28439c030b92c7041bd2e21b8cf37af5ab7e1ee4;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hp=5e23456f7900b6c6a03e4c086c8db8d6631c2e02;hpb=a445bdd3e3ba4abbee441844b6665b4c3c13d48c;p=xscreensaver

diff --git a/utils/xshm.c b/utils/xshm.c
index 5e23456f..28439c03 100644
--- a/utils/xshm.c
+++ b/utils/xshm.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 2001
+/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2006
  *  by Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,9 +21,7 @@
    needed, anyway.)
 
    If you don't have man pages for this extension, see
-   http://www.physik.uni-regensburg.de/~scs22156/sofie-0.2/mit-shm.html
-   or in the R6 sources as "xc/doc/specs/Xext/mit-shm.ms", for example,
-   ftp://ftp.x.org/pub/R6.4/xc/doc/specs/Xext/mit-shm.ms
+   http://www.x.org/X11R6.8.1/docs/Xext/
 
    (This document seems not to ever remain available on the web in one place
    for very long; you can search for it by the title, "MIT-SHM -- The MIT
@@ -99,7 +97,7 @@ create_xshm_image (Display *dpy, Visual *visual,
 {
   Status status;
   XImage *image = 0;
-  if (!get_boolean_resource("useSHM", "Boolean"))
+  if (!get_boolean_resource(dpy, "useSHM", "Boolean"))
     return 0;
 
   if (!XShmQueryExtension (dpy))
@@ -215,7 +213,8 @@ destroy_xshm_image (Display *dpy, XImage *image, XShmSegmentInfo *shm_info)
   if (status != 0)
     {
       char buf[1024];
-      sprintf (buf, "%s: shmdt(0x%x) failed", progname, shm_info->shmaddr);
+      sprintf (buf, "%s: shmdt(0x%lx) failed", progname,
+               (unsigned long) shm_info->shmaddr);
       perror(buf);
     }
 #ifdef DEBUG