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.35.tar.gz
[xscreensaver]
/
hacks
/
flag.c
diff --git
a/hacks/flag.c
b/hacks/flag.c
index 1cd68094b7ec6e641616a71488f6b8218b4fc785..92e6f1765c7bb6d57ee49f9eac99c33157c38392 100644
(file)
--- a/
hacks/flag.c
+++ b/
hacks/flag.c
@@
-194,7
+194,7
@@
make_flag_bits(ModeInfo *mi)
char *bitmap_name = get_string_resource (dpy, "bitmap", "Bitmap");
char *text = get_string_resource (dpy, "text", "Text");
char *bitmap_name = get_string_resource (dpy, "bitmap", "Bitmap");
char *text = get_string_resource (dpy, "text", "Text");
-#ifdef HAVE_
COCOA
+#ifdef HAVE_
JWXYZ
bitmap_name = 0; /* #### always use default */
#endif
bitmap_name = 0; /* #### always use default */
#endif
@@
-268,7
+268,7
@@
make_flag_bits(ModeInfo *mi)
# if defined(_AIX)
sprintf(text, "%s\n%s %s.%s",
uts.nodename, uts.sysname, uts.version, uts.release);
# if defined(_AIX)
sprintf(text, "%s\n%s %s.%s",
uts.nodename, uts.sysname, uts.version, uts.release);
-# elif defined(__APPLE__) /* MacOS X + XDarwin */
+# elif defined(__APPLE__)
&& !defined(USE_IPHONE)
/* MacOS X + XDarwin */
{
const char *file =
"/System/Library/CoreServices/SystemVersion.plist";
{
const char *file =
"/System/Library/CoreServices/SystemVersion.plist";
@@
-460,7
+460,7
@@
init_flag(ModeInfo * mi)
if (!fp->initialized) {
fp->dbufp = True;
if (!fp->initialized) {
fp->dbufp = True;
-# ifdef HAVE_
COCOA
/* Don't second-guess Quartz's double-buffering */
+# ifdef HAVE_
JWXYZ
/* Don't second-guess Quartz's double-buffering */
fp->dbufp = False;
#endif
fp->initialized = True;
fp->dbufp = False;
#endif
fp->initialized = True;