X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fsballs.c;h=25300483e1585eacab093e4c9fe87d0d0d2ff55f;hp=ad77d8c4d5b118060d79227da130f90cfbaed100;hb=96a411663168b0ba5432b407a83be55f3df0c802;hpb=2c902d6065f9856adf31e8540a94f1e42e68e905 diff --git a/hacks/glx/sballs.c b/hacks/glx/sballs.c index ad77d8c4..25300483 100644 --- a/hacks/glx/sballs.c +++ b/hacks/glx/sballs.c @@ -1,6 +1,6 @@ /* sballs --- balls spinning like crazy in GL */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)sballs.c 5.02 2001/03/10 xlockmore"; #endif @@ -74,16 +74,25 @@ static const char sccsid[] = "@(#)sballs.c 5.02 2001/03/10 xlockmore"; #if defined( USE_XPM ) || defined( USE_XPMINC ) || defined( HAVE_XPM ) /* USE_XPM & USE_XPMINC in xlock mode ; HAVE_XPM in xscreensaver mode */ -#include "xpm-ximage.h" -#define I_HAVE_XPM - -#ifdef STANDALONE -#include "../images/sball.xpm" -#include "../images/sball-bg.xpm" -#else /* !STANDALONE */ -#include "pixmaps/sball.xpm" -#include "pixmaps/sball-bg.xpm" -#endif /* !STANDALONE */ +# include "xpm-ximage.h" +# define I_HAVE_XPM + +# ifdef STANDALONE + +# ifdef __GNUC__ + __extension__ /* don't warn about "string length is greater than the length + ISO C89 compilers are required to support" when including + the following XPM file... */ +# endif +# include "../images/sball.xpm" +# ifdef __GNUC__ + __extension__ +# endif +# include "../images/sball-bg.xpm" +# else /* !STANDALONE */ +# include "pixmaps/sball.xpm" +# include "pixmaps/sball-bg.xpm" +# endif /* !STANDALONE */ #endif /* HAVE_XPM */ /* Manage option vars */