X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmemscroller.c;h=ecc96256ff489582003d8867f6b53374efbde896;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=ddd07eed83c49609766691369d80a5d225eb108e;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver

diff --git a/hacks/memscroller.c b/hacks/memscroller.c
index ddd07eed..ecc96256 100644
--- a/hacks/memscroller.c
+++ b/hacks/memscroller.c
@@ -1,4 +1,4 @@
-/* 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
@@ -302,6 +302,18 @@ open_file (state *st)
 #endif
 
 
+/* "The brk and sbrk functions are historical curiosities left over
+   from earlier days before the advent of virtual memory management."
+      -- sbrk(2) man page on BSD systems, as of 1995 or so.
+ */
+#ifdef HAVE_SBRK
+# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
+   /* Don't print "warning: 'sbrk' is deprecated". */
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+# endif
+#endif
+
+
 static unsigned int
 more_bits (state *st, scroller *sc)
 {
@@ -345,10 +357,6 @@ more_bits (state *st, scroller *sc)
         sc->data = lomem;
 
 # ifdef HAVE_SBRK  /* re-get it each time through */
-      /* "The brk and sbrk functions are historical curiosities left over
-         from earlier days before the advent of virtual memory management."
-            -- sbrk(2) man page on MacOS
-       */
       himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
 # endif
 
@@ -619,12 +627,12 @@ static const char *memscroller_defaults [] = {
   "*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-*-*-*",