-/* xscreensaver, Copyright (c) 2002-2012 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2002-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
{
int ncolors = 255;
XColor colors[256];
- make_random_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
+ make_random_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
colors, &ncolors, True, True, 0, False);
}
from earlier days before the advent of virtual memory management."
-- sbrk(2) man page on MacOS
*/
+# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+# endif
himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
# endif
"*borderSize: 2",
#if defined(HAVE_COCOA) && !defined(USE_IPHONE)
- ".font1: OCR A Std 192, Lucida Console 192",
- ".font2: OCR A Std 144, Lucida Console 144",
- ".font3: OCR A Std 128, Lucida Console 128",
- ".font4: OCR A Std 96, Lucida Console 96",
- ".font5: OCR A Std 48, Lucida Console 48",
- ".font6: OCR A Std 24, Lucida Console 24",
+ ".font1: OCR A Std 192, Lucida Console 192, Monaco 192",
+ ".font2: OCR A Std 144, Lucida Console 144, Monaco 144",
+ ".font3: OCR A Std 128, Lucida Console 128, Monaco 128",
+ ".font4: OCR A Std 96, Lucida Console 96, Monaco 96",
+ ".font5: OCR A Std 48, Lucida Console 48, Monaco 48",
+ ".font6: OCR A Std 24, Lucida Console 24, Monaco 24",
#else /* !HAVE_COCOA */
".font1: -*-courier-bold-r-*-*-*-1440-*-*-m-*-*-*",
".font2: -*-courier-bold-r-*-*-*-960-*-*-m-*-*-*",