--- a/src/glyphs-x.c	Mon Aug 13 08:48:43 2007 +0200
+++ b/src/glyphs-x.c	Mon Aug 13 08:49:20 2007 +0200
@@ -984,9 +984,11 @@
 }
 
 static int
-xbm_possible_dest_types ()
+xbm_possible_dest_types (void)
 {
-  return IMAGE_MONO_PIXMAP_MASK | IMAGE_COLOR_PIXMAP_MASK |
+  return
+    IMAGE_MONO_PIXMAP_MASK  |
+    IMAGE_COLOR_PIXMAP_MASK |
     IMAGE_POINTER_MASK;
 }
 
@@ -1066,7 +1068,7 @@
 }
 
 static int
-jpeg_possible_dest_types ()
+jpeg_possible_dest_types (void)
 {
   return IMAGE_COLOR_PIXMAP_MASK;
 }
@@ -1547,7 +1549,7 @@
 }
 
 static int
-gif_possible_dest_types ()
+gif_possible_dest_types (void)
 {
   return IMAGE_COLOR_PIXMAP_MASK;
 }
@@ -1868,7 +1870,7 @@
 }
 
 static int
-png_possible_dest_types ()
+png_possible_dest_types (void)
 {
   return IMAGE_COLOR_PIXMAP_MASK;
 }
@@ -2247,7 +2249,7 @@
 }
 
 static int
-tiff_possible_dest_types ()
+tiff_possible_dest_types (void)
 {
   return IMAGE_COLOR_PIXMAP_MASK;
 }
@@ -2463,9 +2465,11 @@
 }
 
 static int
-xpm_possible_dest_types ()
+xpm_possible_dest_types (void)
 {
-  return IMAGE_MONO_PIXMAP_MASK | IMAGE_COLOR_PIXMAP_MASK |
+  return
+    IMAGE_MONO_PIXMAP_MASK  |
+    IMAGE_COLOR_PIXMAP_MASK |
     IMAGE_POINTER_MASK;
 }
 
@@ -2951,9 +2955,11 @@
 }
 
 static int
-xface_possible_dest_types ()
+xface_possible_dest_types (void)
 {
-  return IMAGE_MONO_PIXMAP_MASK | IMAGE_COLOR_PIXMAP_MASK |
+  return
+    IMAGE_MONO_PIXMAP_MASK  |
+    IMAGE_COLOR_PIXMAP_MASK |
     IMAGE_POINTER_MASK;
 }
 
@@ -2979,8 +2985,8 @@
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
   int i, stattis;
   char *p, *bits, *bp;
-  CONST char *emsg = 0;
-  CONST char *dstring;
+  CONST char * volatile emsg = 0;
+  CONST char * volatile dstring;
 
   assert (!NILP (data));
 
@@ -3127,10 +3133,13 @@
 }
 
 static int
-autodetect_possible_dest_types ()
+autodetect_possible_dest_types (void)
 {
-  return IMAGE_MONO_PIXMAP_MASK | IMAGE_COLOR_PIXMAP_MASK |
-    IMAGE_POINTER_MASK | IMAGE_TEXT_MASK;
+  return
+    IMAGE_MONO_PIXMAP_MASK  |
+    IMAGE_COLOR_PIXMAP_MASK |
+    IMAGE_POINTER_MASK      |
+    IMAGE_TEXT_MASK;
 }
 
 static void
@@ -3225,7 +3234,7 @@
 }
 
 static int
-font_possible_dest_types ()
+font_possible_dest_types (void)
 {
   return IMAGE_POINTER_MASK;
 }
@@ -3323,7 +3332,7 @@
 }
 
 static int
-cursor_font_possible_dest_types ()
+cursor_font_possible_dest_types (void)
 {
   return IMAGE_POINTER_MASK;
 }
@@ -3602,10 +3611,10 @@
   dpy = DisplayOfScreen (LISP_DEVICE_TO_X_SCREEN
 			 (FRAME_DEVICE (XFRAME (sw->frame))));
 
-  property_atom = XInternAtom (dpy, (char *) XSTRING_DATA (property),
-			       False);
+  property_atom = XInternAtom (dpy, (char *) XSTRING_DATA (property), False);
   XChangeProperty (dpy, sw->subwindow, property_atom, XA_STRING, 8,
-		   PropModeReplace, XSTRING_DATA (data),
+		   PropModeReplace,
+		   XSTRING_DATA   (data),
 		   XSTRING_LENGTH (data));
 
   return (property);