X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FscreenhackI.h;h=0a7b0d59fd4ccbabed687cd94891f4f028558685;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=8b4212de132ccb9c5c2332524564c8312e3858ce;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver

diff --git a/hacks/screenhackI.h b/hacks/screenhackI.h
index 8b4212de..0a7b0d59 100644
--- a/hacks/screenhackI.h
+++ b/hacks/screenhackI.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2016 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2018 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
@@ -70,6 +70,10 @@
 
 #ifdef HAVE_JWXYZ
 # include "jwxyz.h"
+# include <string.h> /* X11/Xos.h brings this in. */
+/* From utils/visual.c. */
+# define DEFAULT_VISUAL	-1
+# define GL_VISUAL	-6
 #else  /* real X11 */
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
@@ -83,7 +87,7 @@
 
 #ifdef HAVE_ANDROID
  /* So that hacks' debug output shows up in logcat... */
- extern void Log(const char *fmt, ...);  /* jwxyz-android.c */
+# undef  fprintf
 # define fprintf(S, ...) Log(__VA_ARGS__)
 #endif
 
@@ -109,6 +113,7 @@
 #include "grabscreen.h"
 #include "visual.h"
 #include "fps.h"
+#include "font-retry.h"
 
 /* Be Posixly correct */
 #undef  bzero
@@ -139,8 +144,12 @@ struct xscreensaver_function_table {
   void           (*free_cb)    (Display *, Window, void *);
   void           (*fps_cb)     (Display *, Window, fps_state *, void *);
 
+# ifndef HAVE_JWXYZ
   Visual *       (*pick_visual_hook) (Screen *);
   Bool           (*validate_visual_hook) (Screen *, const char *, Visual *);
+# else
+  int            visual;
+# endif
 
 };