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

Removed "OLD_UPPERCASE_CODE"

Browse source
This commit is contained in:
William Kendrick 2008-05-29 15:28:26 +00:00
parent 2687b4efd1
commit 4aa7703811
3 changed files with 6 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/CHANGES.txt
View file

@ -80,8 +80,11 @@ $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 * Removed "_APPLE_10_2_8_"-related #include work-arounds, since 10.2.8
right now. (With Martin F's blessings) support is unlikely right now. (With Martin F's blessings)
* Removed "OLD_UPPERCASE_CODE"-based work-arounds, since no longer
necessary. (With Luc S's blessings on BeOS.)
* Documentation Improvements: * Documentation Improvements:
--------------------------- ---------------------------

7
src/i18n.c
View file

@ -25,7 +25,7 @@
$Id$ $Id$
June 14, 2002 - May 28, 2008 June 14, 2002 - May 29, 2008
*/ */
#include <stdio.h> #include <stdio.h>
@ -36,17 +36,12 @@
#include "i18n.h" #include "i18n.h"
#include "debug.h" #include "debug.h"
#ifdef WIN32 #ifdef WIN32
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <wchar.h> #include <wchar.h>
#ifndef OLD_UPPERCASE_CODE
#include <wctype.h> #include <wctype.h>
#endif
/* Globals: */ /* Globals: */

33
src/tuxpaint.c
View file

@ -206,12 +206,8 @@ char *strcasestr(const char *haystack, const char *needle)
#undef y1 #undef y1
#include <locale.h> #include <locale.h>
#include <wchar.h> #include <wchar.h>
#ifndef OLD_UPPERCASE_CODE
#include <wctype.h> #include <wctype.h>
#endif
#include <libintl.h> #include <libintl.h>
#ifndef gettext_noop #ifndef gettext_noop
@ -4887,10 +4883,6 @@ static void show_version(int details)
printf(" Old-style stamp size UI (OLD_STAMP_GROW_SHRINK)\n"); printf(" Old-style stamp size UI (OLD_STAMP_GROW_SHRINK)\n");
#endif #endif
#ifdef OLD_UPPERCASE_CODE
printf(" Old-style --uppercase support (OLD_UPPERCASE_CODE)\n");
#endif
printf(" Data directory (DATA_PREFIX) = %s\n", DATA_PREFIX); printf(" Data directory (DATA_PREFIX) = %s\n", DATA_PREFIX);
printf(" Plugin directory (MAGIC_PREFIX) = %s\n", MAGIC_PREFIX); printf(" Plugin directory (MAGIC_PREFIX) = %s\n", MAGIC_PREFIX);
printf(" Doc directory (DOC_PREFIX) = %s\n", DOC_PREFIX); printf(" Doc directory (DOC_PREFIX) = %s\n", DOC_PREFIX);
@ -15278,29 +15270,6 @@ static void do_render_cur_text(int do_blit)
/* Return string as uppercase if that option is set: */ /* Return string as uppercase if that option is set: */
#ifdef OLD_UPPERCASE_CODE
static char *uppercase(const char *restrict const str)
{
char *ustr = strdup(str);
if (only_uppercase)
{
unsigned i = 0;
do{
ustr[i] = toupper(ustr[i]);
while(ustr[i++]);
}
#ifdef DEBUG
printf(" ORIGINAL: %s\n" "UPPERCASE: %s\n\n", str, ustr);
#endif
return ustr;
}
#else
static char *uppercase(const char *restrict const str) static char *uppercase(const char *restrict const str)
{ {
unsigned int i, n; unsigned int i, n;
@ -15329,8 +15298,6 @@ static char *uppercase(const char *restrict const str)
return ustr; return ustr;
} }
#endif
static wchar_t *uppercase_w(const wchar_t *restrict const str) static wchar_t *uppercase_w(const wchar_t *restrict const str)
{ {
unsigned n = wcslen(str) + 1; unsigned n = wcslen(str) + 1;