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

[xscreensaver] / utils / utils.h

diff --git a/utils/utils.h b/utils/utils.h
index 284bb86dcd0ddaf27a775240984824100f1028f3..09b4da8662c99c15d1dd1bbd1d0903ad4796fbb2 100644 (file)
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997-2014 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,5 +18,10 @@
 #include <string.h>
 #include <math.h>
 
-#include <X11/Xlib.h>
-#include <X11/Xos.h>
+#ifdef HAVE_JWXYZ
+# include "jwxyz.h"
+#else /* real X11 */
+# include <X11/Xlib.h>
+# include <X11/Xutil.h>
+# include <X11/Xos.h>
+#endif /* !HAVE_JWXYZ */