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
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);
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;