#define fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2285 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index f342c68634751ab0dedf65851184626ae70c2ec6..a2220db29e52aab99b0094cf5163208c0afa40b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -178,6 +178,9 @@ CVS code -
        - Try to automatically detect whether UTF-8 support is needed by
          setting the NO_UTF8 flag if setlocale() returns a string that
          doesn't contain "UTF-8". (DLR)
+- nano.h:
+       - Remove now-unneeded #defines for functions that now have
+         multibyte equivalents. (DLR)
 - utils.c:
   regexec_safe()
        - Remove redundant regexec #define, and move the regexec #undef

diff --git a/src/nano.h b/src/nano.h
index 8ed5dce98fcd9a0db5f55953fba82ea8909a1e31..31a50866a35e028b61e2af3500c7662dba724334 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -102,12 +102,8 @@
 
 /* If no strcasestr(), getdelim(), or getline(), use the versions we
  * have. */
-#ifndef HAVE_STRNCASECMP
-#define strncasecmp nstrnicmp
-#endif
-
 #ifndef HAVE_STRCASESTR
-#define strcasestr nstristr
+#define strcasestr nstrcasestr
 #endif
 
 #ifndef HAVE_GETDELIM