projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.31.tar.gz
[xscreensaver]
/
hacks
/
xlockmore.h
diff --git
a/hacks/xlockmore.h
b/hacks/xlockmore.h
index baedf6bad577e9458869f63b1bfdb44f718c9602..d477970f54f9cc2edd82e1981e7ee1ecc92750d6 100644
(file)
--- a/
hacks/xlockmore.h
+++ b/
hacks/xlockmore.h
@@
-112,10
+112,10
@@
ERROR! Sorry, xlockmore.h requires ANSI C (gcc, for example.)
a struct in `MODULENAME_xscreensaver_function_table',
and a pointer to that in `xscreensaver_function_table'.
a struct in `MODULENAME_xscreensaver_function_table',
and a pointer to that in `xscreensaver_function_table'.
- In a Cocoa world, we only define the prefixed symbol;
+ In a Cocoa
or Android
world, we only define the prefixed symbol;
the un-prefixed symbol does not exist.
*/
the un-prefixed symbol does not exist.
*/
-#if
def HAVE_COCOA
+#if
defined(HAVE_COCOA) || defined(HAVE_ANDROID)
# define XSCREENSAVER_LINK(NAME)
#else
# define XSCREENSAVER_LINK(NAME) \
# define XSCREENSAVER_LINK(NAME)
#else
# define XSCREENSAVER_LINK(NAME) \
@@
-123,10
+123,10
@@
ERROR! Sorry, xlockmore.h requires ANSI C (gcc, for example.)
#endif
#endif
-# if !defined(USE_GL) || defined(HAVE_COCOA)
+# if !defined(USE_GL) || defined(HAVE_COCOA)
|| defined(HAVE_ANDROID)
# define xlockmore_pick_gl_visual 0
# define xlockmore_validate_gl_visual 0
# define xlockmore_pick_gl_visual 0
# define xlockmore_validate_gl_visual 0
-# endif /* !USE_GL || HAVE_COCOA */
+# endif /* !USE_GL || HAVE_COCOA
|| HAVE_ANDROID
*/
# ifdef USE_GL
# define XLOCKMORE_FPS xlockmore_gl_compute_fps
# ifdef USE_GL
# define XLOCKMORE_FPS xlockmore_gl_compute_fps