X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2FscreenhackI.h;h=8b4212de132ccb9c5c2332524564c8312e3858ce;hp=b5a1709f1038561be77833d5f58fce3e4e712636;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hpb=88cfe534a698a0562e81345957a50714af1453bc diff --git a/hacks/screenhackI.h b/hacks/screenhackI.h index b5a1709f..8b4212de 100644 --- a/hacks/screenhackI.h +++ b/hacks/screenhackI.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1992-2014 Jamie Zawinski +/* xscreensaver, Copyright (c) 1992-2016 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -60,6 +60,7 @@ #include #include #include +#include #ifdef __hpux /* Which of the ten billion standards does values.h belong to? @@ -67,14 +68,24 @@ # include #endif -#if defined(HAVE_COCOA) || defined(HAVE_ANDROID) +#ifdef HAVE_JWXYZ # include "jwxyz.h" #else /* real X11 */ # include # include # include # include -#endif /* !HAVE_COCOA */ +#endif /* !HAVE_JWXYZ */ + +#if defined(USE_IPHONE) || defined(HAVE_ANDROID) +# define HAVE_MOBILE +#endif + +#ifdef HAVE_ANDROID + /* So that hacks' debug output shows up in logcat... */ + extern void Log(const char *fmt, ...); /* jwxyz-android.c */ +# define fprintf(S, ...) Log(__VA_ARGS__) +#endif /* M_PI ought to have been defined in math.h, but... */ #ifndef M_PI