From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz

[xscreensaver] / hacks / screenhack.h

diff --git a/hacks/screenhack.h b/hacks/screenhack.h
index 9cce8dc94daa0bd1e7aff055a09a1ed63ffadb22..2e55d8930122a0e53371660c65f787f72f5c56e3 100644 (file)
--- a/hacks/screenhack.h
+++ b/hacks/screenhack.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2015 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -18,10 +18,10 @@
    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/Android world, we only define the prefixed symbol;
    the un-prefixed symbol does not exist.
  */
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 # define XSCREENSAVER_LINK(NAME)
 #else
 # define XSCREENSAVER_LINK(NAME) \
@@ -29,7 +29,7 @@
 #endif
 
 
-#if defined(HAVE_COCOA) && !defined(__XLOCKMORE_INTERNAL_H__)
+#if defined(HAVE_JWXYZ) && !defined(__XLOCKMORE_INTERNAL_H__)
   /* this is one enormous kludge... */
 # undef ya_rand_init
   static void
@@ -52,10 +52,10 @@
           PREFIX ## _reshape,                                  \
           PREFIX ## _event,                                    \
           PREFIX ## _free,                                     \
-           0, 0 };                                             \
+           0, 0, 0 };                                          \
   XSCREENSAVER_LINK (NAME ## _xscreensaver_function_table)
 
-#define XSCREENSAVER_MODULE(CLASS,PREFIX)                              \
+#define XSCREENSAVER_MODULE(CLASS,PREFIX)                      \
       XSCREENSAVER_MODULE_2(CLASS,PREFIX,PREFIX)
 
 #endif /* __SCREENHACK_H__ */