diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-09-27 02:06:27 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-01-20 23:25:31 -0500 |
| commit | 38bac54519a67ab1a276b66dbaa84a3327ccf827 (patch) | |
| tree | e33b5c1e5b89f5d31295fbcc74a4d9cb216d4ec8 | |
| parent | f431b4eb4dc743ccdf94b1b2ed858cc21f63c091 (diff) | |
Remove some strcasecmp silliness
| -rw-r--r-- | include/X11/fonts/fontmisc.h | 10 | ||||
| -rw-r--r-- | src/FreeType/xttcap.h | 4 | ||||
| -rw-r--r-- | src/util/fontutil.c | 28 |
3 files changed, 0 insertions, 42 deletions
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h index 8df5a6a..ed5fd19 100644 --- a/include/X11/fonts/fontmisc.h +++ b/include/X11/fonts/fontmisc.h @@ -1,5 +1,3 @@ -/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -59,19 +57,11 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit ); extern int ValidAtom ( Atom atom ); extern char *NameForAtom (Atom atom); -extern int f_strcasecmp(const char *s1, const char *s2); - #define lowbit(x) ((x) & (~(x) + 1)) #undef assert #define assert(x) ((void)0) -#ifndef strcasecmp -#if defined(NEED_STRCASECMP) -#define strcasecmp(s1,s2) f_strcasecmp(s1,s2) -#endif -#endif - extern void BitOrderInvert( register unsigned char *, diff --git a/src/FreeType/xttcap.h b/src/FreeType/xttcap.h index 9da3c96..e91e523 100644 --- a/src/FreeType/xttcap.h +++ b/src/FreeType/xttcap.h @@ -121,10 +121,6 @@ SPropRecValList_dump(SRefPropRecValList *refList); Prototypes (xttmisc) */ -/* compare strings with ignoring case */ - /* False == equal, True == not equal */ -Bool mystrcasecmp(char const *s1, char const *s2); - /* strdup clone */ char * XttXstrdup(char const *str); #undef xstrdup diff --git a/src/util/fontutil.c b/src/util/fontutil.c index 181b1b2..aa89ce0 100644 --- a/src/util/fontutil.c +++ b/src/util/fontutil.c @@ -411,31 +411,3 @@ add_range(fsRange *newrange, return Successful; } - -/* It is difficult to find a good place for this. */ -#ifdef NEED_STRCASECMP -int -f_strcasecmp(const char *s1, const char *s2) -{ - char c1, c2; - - if (*s1 == 0) - if (*s2 == 0) - return 0; - else - return 1; - - c1 = (isupper (*s1) ? tolower (*s1) : *s1); - c2 = (isupper (*s2) ? tolower (*s2) : *s2); - while (c1 == c2) { - if (c1 == '\0') - return 0; - s1++; - s2++; - c1 = (isupper (*s1) ? tolower (*s1) : *s1); - c2 = (isupper (*s2) ? tolower (*s2) : *s2); - } - return c1 - c2; -} -#endif - |