projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.x.org/contrib/applications/xscreensaver-3.07.tar.gz
[xscreensaver]
/
hacks
/
glx
/
xpm-ximage.c
diff --git
a/hacks/glx/xpm-ximage.c
b/hacks/glx/xpm-ximage.c
index 44f64dbf3d97ae2425e03d11ce326fdc9a642045..ded8bbb5567d19bc7d5c210fd34026533aaae9c4 100644
(file)
--- a/
hacks/glx/xpm-ximage.c
+++ b/
hacks/glx/xpm-ximage.c
@@
-14,16
+14,17
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#ifdef HAVE_XPM /* whole file */
-
#include <stdlib.h>
#include <stdio.h>
#include <X11/Intrinsic.h>
#include <stdlib.h>
#include <stdio.h>
#include <X11/Intrinsic.h>
-#include <X11/Xutil.h>
-#include <X11/xpm.h>
extern char *progname;
extern char *progname;
+#ifdef HAVE_XPM /* whole file */
+
+#include <X11/Xutil.h>
+#include <X11/xpm.h>
+
static Bool
bigendian (void)
{
static Bool
bigendian (void)
{
@@
-135,7
+136,7
@@
xpm_to_ximage (Display *dpy, Visual *visual, Colormap cmap, char **xpm_data)
#else /* !HAVE_XPM */
#else /* !HAVE_XPM */
-
static
XImage *
+XImage *
xpm_to_ximage (char **xpm_data)
{
fprintf(stderr, "%s: not compiled with XPM support.\n", progname);
xpm_to_ximage (char **xpm_data)
{
fprintf(stderr, "%s: not compiled with XPM support.\n", progname);