X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FscreenhackI.h;h=3494684e4129b668f4ae8485e0f9e46b8ab46a8d;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hp=b5a1709f1038561be77833d5f58fce3e4e712636;hpb=d5186197bc394e10a4402f7f6d23fbb14103bc50;p=xscreensaver diff --git a/hacks/screenhackI.h b/hacks/screenhackI.h index b5a1709f..3494684e 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,23 @@ # 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... */ +# define fprintf(S, ...) Log(__VA_ARGS__) +#endif /* M_PI ought to have been defined in math.h, but... */ #ifndef M_PI