From 0668cd3b474ce16bec5a31e1f4be449f9fbe7961 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Wed, 28 May 2008 14:43:25 +0000
Subject: [PATCH] Removed _APPLE_10_2_8_-related stuff.

---
 docs/CHANGES.txt |  5 ++++-
 src/i18n.c       | 12 +-----------
 src/im.c         |  5 -----
 src/tuxpaint.c   | 19 ++-----------------
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 224777721..95842be32 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,7 +9,7 @@ http://www.tuxpaint.org/
 $Id$
 
 
-2008.May.26 (0.9.20)
+2008.May.27 (0.9.20)
   * New translations:
     -----------------
     * Asturian
@@ -80,6 +80,9 @@ $Id$
 
     * Making Magic Tool source throw fewer compiler warnings.
 
+    * Removed "_APPLE_10_2_8_"-related #include work-arounds, since 10.2.8 support is unlikely
+      right now. (With Martin F's blessings)
+
   * Documentation Improvements:
     ---------------------------
     * Mentioned that canvas size can be changed in README (so it's not
diff --git a/src/i18n.c b/src/i18n.c
index c198c9452..ed9fd0cc0 100644
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -25,7 +25,7 @@
 
   $Id$
 
-  June 14, 2002 - May 27, 2008
+  June 14, 2002 - May 28, 2008
 */
 
 #include <stdio.h>
@@ -42,17 +42,7 @@
 #endif
 
 
-/* (Trouble building this for 10.2.8 target; bjk & mf 2006.01.14) */
-#ifndef __APPLE_10_2_8__
 #include <wchar.h>
-#else
-#undef FORKED_FONTS
-#define wchar_t char
-#define wcslen strlen
-#define towupper toupper
-#define iswprint isprint
-#define OLD_UPPERCASE_CODE
-#endif
 
 #ifndef OLD_UPPERCASE_CODE
 #include <wctype.h>
diff --git a/src/im.c b/src/im.c
index 5132ec215..c528ff018 100644
--- a/src/im.c
+++ b/src/im.c
@@ -40,12 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifndef __APPLE_10_2_8__
 #include <wchar.h>
-#else
-#define wchar_t char
-#endif
 
 #include "im.h"
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 4896522b2..865a91ca7 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
   
-  June 14, 2002 - May 27, 2008
+  June 14, 2002 - May 28, 2008
   $Id$
 */
 
@@ -199,20 +199,8 @@ char *strcasestr(const char *haystack, const char *needle)
 
 #endif
 
-/* kludge; 2006.01.15 */
-//#define __APPLE_10_2_8__
 
-/* (Trouble building this for 10.2.8 target; bjk & mf 2006.01.14) */
-#ifndef __APPLE_10_2_8__
 #include <wchar.h>
-#else
-#undef FORKED_FONTS
-#define wchar_t char
-#define wcslen strlen
-#define towupper toupper
-#define iswprint isprint
-#define OLD_UPPERCASE_CODE
-#endif
 
 // math.h makes y1 an obscure function!
 #define y1 evil_y1
@@ -225,7 +213,7 @@ char *strcasestr(const char *haystack, const char *needle)
 #include <wctype.h>
 #else
 #if defined (__BEOS__) && !defined (__HAIKU__)
-#include <wchar.h>
+#include <wchar.h> // FIXME - Going to happen anway, due to #include above! -bjk 2008.05.28
 #endif
 #endif
 
@@ -4854,9 +4842,6 @@ static void show_version(int details)
 
 #ifdef __APPLE__
   printf("  Built for Mac OS X  (__APPLE__)\n");
-  #ifdef __APPLE_10_2_8_
-    printf("  Built for OS X 10.2.8  (__APPLE_10_2_8_)\n");
-  #endif
 #elif WIN32
   printf("  Built for Windows  (WIN32)\n");
 #elif __BEOS__