diff options
| -rw-r--r-- | apps/unix/x11pdf.c | 1 | ||||
| -rw-r--r-- | apps/unix/ximage.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apps/unix/x11pdf.c b/apps/unix/x11pdf.c index eecb70dd..72bccd69 100644 --- a/apps/unix/x11pdf.c +++ b/apps/unix/x11pdf.c @@ -7,7 +7,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> -#include <X11/Intrinsic.h> #include <X11/cursorfont.h> #include <X11/keysym.h> 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, }; + |