Full implementation of server identity checking per RFC2830 section 3.6

[openldap] / libraries / liblunicode / ure / ure.h

diff --git a/libraries/liblunicode/ure/ure.h b/libraries/liblunicode/ure/ure.h
index e8b3aa93c15992118703b2855ae3313836d5b9de..f4906b8d901c7e2667a917d8b0fe33538c6050a0 100644 (file)
--- a/libraries/liblunicode/ure/ure.h
+++ b/libraries/liblunicode/ure/ure.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 2000-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -38,9 +38,6 @@
 
 LDAP_BEGIN_DECL
 
-#undef __
-#define __(x) x
-
 /*
  * Set of character class flags.
  */
@@ -116,18 +113,18 @@ typedef struct _ure_dfa_t *ure_dfa_t;
  *
  *************************************************************************/
 
-extern ure_buffer_t ure_buffer_create __((void));
+extern ure_buffer_t ure_buffer_create LDAP_P((void));
 
-extern void ure_buffer_free __((ure_buffer_t buf));
+extern void ure_buffer_free LDAP_P((ure_buffer_t buf));
 
-extern ure_dfa_t ure_compile __((ucs2_t *re, unsigned long relen,
+extern ure_dfa_t ure_compile LDAP_P((ucs2_t *re, unsigned long relen,
                                  int casefold, ure_buffer_t buf));
 
-extern void ure_dfa_free __((ure_dfa_t dfa));
+extern void ure_dfa_free LDAP_P((ure_dfa_t dfa));
 
-extern void ure_write_dfa __((ure_dfa_t dfa, FILE *out));
+extern void ure_write_dfa LDAP_P((ure_dfa_t dfa, FILE *out));
 
-extern int ure_exec __((ure_dfa_t dfa, int flags,
+extern int ure_exec LDAP_P((ure_dfa_t dfa, int flags,
                         ucs2_t *text, unsigned long textlen,
                         unsigned long *match_start, unsigned long *match_end));
 
@@ -138,11 +135,9 @@ extern int ure_exec __((ure_dfa_t dfa, int flags,
  *
  *************************************************************************/
 
-extern ucs4_t _ure_tolower __((ucs4_t c));
-
-extern int _ure_matches_properties __((unsigned long props, ucs4_t c));
+extern ucs4_t _ure_tolower LDAP_P((ucs4_t c));
 
-#undef __
+extern int _ure_matches_properties LDAP_P((unsigned long props, ucs4_t c));
 
 LDAP_END_DECL