diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.common | 1 | ||||
| -rw-r--r-- | config.h.win32 | 1 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | debian/copyright | 1 | ||||
| -rw-r--r-- | packaging/macosx/native-gtk/config.h | 3 | ||||
| -rw-r--r-- | strcasecmp.c | 45 |
7 files changed, 1 insertions, 61 deletions
diff --git a/Makefile.am b/Makefile.am index 4310f2c2fc..c51d495194 100644 --- a/Makefile.am +++ b/Makefile.am @@ -302,7 +302,7 @@ include Makefile.common # by wireshark and tshark and stuff needed only by one or the # other. wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \ - @STRCASECMP_O@ @STRNCASECMP_O@ @STRPTIME_O@ + @STRNCASECMP_O@ @STRPTIME_O@ if ENABLE_STATIC wireshark_LDFLAGS = -Wl,-static -all-static diff --git a/Makefile.common b/Makefile.common index 8e871139f1..39496e7e3b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -126,7 +126,6 @@ EXTRA_wireshark_SOURCES = \ inet_ntop.c \ inet_pton.c \ strerror.c \ - strcasecmp.c \ strncasecmp.c \ strptime.c diff --git a/config.h.win32 b/config.h.win32 index 74b69607d3..eff90988ca 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -227,7 +227,6 @@ #define _WIN32_WINNT _WIN32_WINNT_WIN2K #endif -#define strcasecmp stricmp #define strncasecmp strnicmp #define popen _popen #define pclose _pclose diff --git a/configure.in b/configure.in index aa235d1e3c..47a713b0cd 100644 --- a/configure.in +++ b/configure.in @@ -1443,15 +1443,6 @@ fi AC_SUBST(STRERROR_C) AC_SUBST(STRERROR_O) -AC_CHECK_FUNC(strcasecmp, STRCASECMP_O="", - STRCASECMP_O="strcasecmp.o") -if test "$ac_cv_func_strcasecmp" = no ; then - STRCASECMP_C="strcasecmp.c" - STRCASECMP_O="strcasecmp.o" -fi -AC_SUBST(STRCASECMP_C) -AC_SUBST(STRCASECMP_O) - AC_CHECK_FUNC(strncasecmp, STRNCASECMP_O="", STRNCASECMP_O="strncasecmp.o") if test "$ac_cv_func_strncasecmp" = no ; then diff --git a/debian/copyright b/debian/copyright index c71f438397..08024372fe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -68,7 +68,6 @@ LGPL mkstemp.c: LGPL, from GNU C Library mkstemp.h: idem -strcasecmp.c: idem strncasecmp.c: idem strptime.c: idem ps.c: idem diff --git a/packaging/macosx/native-gtk/config.h b/packaging/macosx/native-gtk/config.h index 49d05c88b2..4422a770e9 100644 --- a/packaging/macosx/native-gtk/config.h +++ b/packaging/macosx/native-gtk/config.h @@ -292,9 +292,6 @@ /* Define to 1 if you have the `stpcpy' function. */ #define HAVE_STPCPY 1 -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 diff --git a/strcasecmp.c b/strcasecmp.c deleted file mode 100644 index cee87b5863..0000000000 --- a/strcasecmp.c +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <string.h> -#include <ctype.h> - -/* Compare S1 and S2, ignoring case, returning less than, equal to or - greater than zero if S1 is lexicographically less than, - equal to or greater than S2. */ -int -strcasecmp (const char *s1, const char *s2) -{ - register const unsigned char *p1 = (const unsigned char *) s1; - register const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2) - return 0; - - do - { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0') - break; - } - while (c1 == c2); - - return c1 - c2; -} |