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
# 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";
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;