Simplications go on.

[apps/madmutt.git] / lib-lib / ascii.h

diff --git a/lib-lib/ascii.h b/lib-lib/ascii.h
index ee8b205..b449d8d 100644 (file)
--- a/lib-lib/ascii.h
+++ b/lib-lib/ascii.h
@@ -1,15 +1,24 @@
 /*
- * Copyright notice from original mutt:
- * Copyright (C) 2001 Thomas Roessler <roessler@does-not-exist.org>
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.
+ *
+ *  This program 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
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA 02110-1301, USA.
  *
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
+ *  Copyright © 2006 Pierre Habouzit
  */
-
-/* 
- * Versions of the string comparison functions which are
- * locale-insensitive.
+/*
+ * Copyright notice from original mutt:
+ * Copyright (C) 2001 Thomas Roessler <roessler@does-not-exist.org>
  */
 
 #ifndef MUTT_LIB_LIB_ASCII_H
@@ -40,7 +49,7 @@ static inline int ascii_tolower(int c) {
 int ascii_strcasecmp(const char *a, const char *b);
 int ascii_strncasecmp(const char *a, const char *b, int n);
 
-#define ascii_strcmp(a,b)     str_cmp(a,b)
-#define ascii_strncmp(a,b,c)  str_ncmp(a,b,c)
+#define ascii_strcmp(a,b)     m_strcmp(a,b)
+#define ascii_strncmp(a,b,c)  m_strncmp(a,b,c)
 
 #endif /* MUTT_LIB_LIB_ASCII_H */