notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed _APPLE_10_2_8_-related stuff.

Browse source
This commit is contained in:
William Kendrick 2008-05-28 14:43:25 +00:00
parent 0b2b45c16e
commit 0668cd3b47
4 changed files with 7 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/CHANGES.txt
View file

@ -9,7 +9,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2008.May.26 (0.9.20) 2008.May.27 (0.9.20)
* New translations: * New translations:
----------------- -----------------
* Asturian * Asturian
@ -80,6 +80,9 @@ $Id$
* Making Magic Tool source throw fewer compiler warnings. * 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: * Documentation Improvements:
--------------------------- ---------------------------
* Mentioned that canvas size can be changed in README (so it's not * Mentioned that canvas size can be changed in README (so it's not

12
src/i18n.c
View file

@ -25,7 +25,7 @@
$Id$ $Id$
June 14, 2002 - May 27, 2008 June 14, 2002 - May 28, 2008
*/ */
#include <stdio.h> #include <stdio.h>
@ -42,17 +42,7 @@
#endif #endif
/* (Trouble building this for 10.2.8 target; bjk & mf 2006.01.14) */
#ifndef __APPLE_10_2_8__
#include <wchar.h> #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 #ifndef OLD_UPPERCASE_CODE
#include <wctype.h> #include <wctype.h>

5
src/im.c
View file

@ -40,12 +40,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifndef __APPLE_10_2_8__
#include <wchar.h> #include <wchar.h>
#else
#define wchar_t char
#endif
#include "im.h" #include "im.h"

19
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - May 27, 2008 June 14, 2002 - May 28, 2008
$Id$ $Id$
*/ */
@ -199,20 +199,8 @@ char *strcasestr(const char *haystack, const char *needle)
#endif #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> #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! // math.h makes y1 an obscure function!
#define y1 evil_y1 #define y1 evil_y1
@ -225,7 +213,7 @@ char *strcasestr(const char *haystack, const char *needle)
#include <wctype.h> #include <wctype.h>
#else #else
#if defined (__BEOS__) && !defined (__HAIKU__) #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
#endif #endif
@ -4854,9 +4842,6 @@ static void show_version(int details)
#ifdef __APPLE__ #ifdef __APPLE__
printf(" Built for Mac OS X (__APPLE__)\n"); 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 #elif WIN32
printf(" Built for Windows (WIN32)\n"); printf(" Built for Windows (WIN32)\n");
#elif __BEOS__ #elif __BEOS__