From aae3c49df6a0e8533ac2bfa5a69523b9ac1433fa Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ghostscript.com>
Date: Sun, 5 Jun 2005 01:16:53 +0200
Subject: fix x11 warnings and a stray include

---
 apps/unix/ximage.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'apps/unix/ximage.c')

diff --git a/apps/unix/ximage.c b/apps/unix/ximage.c
index 9f7ec064..22e04a41 100644
--- a/apps/unix/ximage.c
+++ b/apps/unix/ximage.c
@@ -10,6 +10,8 @@
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
 
+extern int ffs(int);
+
 typedef void (*ximage_convert_func_t)
 	(
 	 const unsigned char *src,
@@ -409,8 +411,10 @@ ximage_blit(Drawable d, GC gc,
 }
 
 /*
- *
+ * Primitive conversion functions
  */
+
+#ifndef restrict
 #ifndef _C99
 #ifdef __GNUC__
 #define restrict __restrict__
@@ -418,6 +422,7 @@ ximage_blit(Drawable d, GC gc,
 #define restrict
 #endif
 #endif
+#endif
 
 #define PARAMS \
 	 const unsigned char * restrict src, \
@@ -664,3 +669,4 @@ ximage_convert_func_t ximage_convert_funcs[] = {
 	ximage_convert_rgb555_br,
 	ximage_convert_bgr233,
 };
+
-- 
cgit v1.2.3