X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fscreenhack.h;h=78621ab768edbc87b0b9c325ad3faff1608b3071;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=1f9a561d690ffa7ab5d6d3a9e3150425d0b6b438;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/screenhack.h b/hacks/screenhack.h
index 1f9a561d..78621ab7 100644
--- a/hacks/screenhack.h
+++ b/hacks/screenhack.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2008 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
@@ -40,6 +40,12 @@
 #endif
 
 
+#ifdef HAVE_JWXYZ
+# define SCREENHACK_VISUAL DEFAULT_VISUAL
+#else /* !HAVE_JWXYZ */
+# define SCREENHACK_VISUAL 0, 0
+#endif /* !HAVE_JWXYZ */
+
 #define XSCREENSAVER_MODULE_2(CLASS,NAME,PREFIX)		\
   struct xscreensaver_function_table				\
 	 NAME ## _xscreensaver_function_table = {		\
@@ -52,7 +58,7 @@
 	   PREFIX ## _reshape,					\
 	   PREFIX ## _event,					\
 	   PREFIX ## _free,					\
-           0, 0, 0 };						\
+	   0, SCREENHACK_VISUAL };					\
   XSCREENSAVER_LINK (NAME ## _xscreensaver_function_table)
 
 #define XSCREENSAVER_MODULE(CLASS,PREFIX)			\