X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fflag.c;h=72c1bbb99312a767ca458e06dd232dda8592564b;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=1cd68094b7ec6e641616a71488f6b8218b4fc785;hpb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;p=xscreensaver

diff --git a/hacks/flag.c b/hacks/flag.c
index 1cd68094..72c1bbb9 100644
--- 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");
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
   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);
-#  elif defined(__APPLE__)  /* MacOS X + XDarwin */
+#  elif defined(__APPLE__) && !defined(USE_IPHONE)  /* MacOS X + XDarwin */
               {
                 const char *file = 
                   "/System/Library/CoreServices/SystemVersion.plist";
@@ -432,11 +432,7 @@ init_flag(ModeInfo * mi)
 	int         size = MI_SIZE(mi);
 	flagstruct *fp;
 
-	if (flags == NULL) {
-		if ((flags = (flagstruct *) calloc(MI_NUM_SCREENS(mi),
-					       sizeof (flagstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, flags, 0);
 	fp = &flags[MI_SCREEN(mi)];
 
 	make_flag_bits(mi);
@@ -460,7 +456,7 @@ init_flag(ModeInfo * mi)
 
 	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;