Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / include / ac / ctype.h

diff --git a/include/ac/ctype.h b/include/ac/ctype.h
index b5638fe97d1eb315d49407283fa7396f0615e285..d63d026e4cbeed58aea0789725d1f056565162fb 100644 (file)
--- a/include/ac/ctype.h
+++ b/include/ac/ctype.h
@@ -1,12 +1,17 @@
 /* Generic ctype.h */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_CTYPE_H
@@ -14,6 +19,9 @@
 
 #include <ctype.h>
 
+#undef TOUPPER
+#undef TOLOWER
+
 #ifdef C_UPPER_LOWER
 # define TOUPPER(c)    (islower(c) ? toupper(c) : (c))
 # define TOLOWER(c)    (isupper(c) ? tolower(c) : (c))