ITS#4707 added new ldap_init_fd() API

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

diff --git a/libraries/liblunicode/ure/ure.h b/libraries/liblunicode/ure/ure.h
index e8b3aa93c15992118703b2855ae3313836d5b9de..bc3030600eabbdf4eed0bc33966c1610b3c5136f 100644 (file)
--- a/libraries/liblunicode/ure/ure.h
+++ b/libraries/liblunicode/ure/ure.h
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 2000-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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>.
  */
-/*
- * Copyright 1997, 1998, 1999 Computing Research Labs,
+/* Copyright 1997, 1998, 1999 Computing Research Labs,
  * New Mexico State University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -25,22 +33,18 @@
  * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+/* $Id: ure.h,v 1.2 1999/09/21 15:47:44 mleisher Exp $ */
+
 #ifndef _h_ure
 #define _h_ure
 
 #include "portable.h"
 
-/*
- * $Id: ure.h,v 1.2 1999/09/21 15:47:44 mleisher Exp $
- */
 
 #include <stdio.h>
 
 LDAP_BEGIN_DECL
 
-#undef __
-#define __(x) x
-
 /*
  * Set of character class flags.
  */
@@ -116,20 +120,22 @@ typedef struct _ure_dfa_t *ure_dfa_t;
  *
  *************************************************************************/
 
-extern ure_buffer_t ure_buffer_create __((void));
+LDAP_LUNICODE_F (ure_buffer_t) ure_buffer_create LDAP_P((void));
 
-extern void ure_buffer_free __((ure_buffer_t buf));
+LDAP_LUNICODE_F (void) ure_buffer_free LDAP_P((ure_buffer_t buf));
 
-extern ure_dfa_t ure_compile __((ucs2_t *re, unsigned long relen,
-                                 int casefold, ure_buffer_t buf));
+LDAP_LUNICODE_F (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));
+LDAP_LUNICODE_F (void) ure_dfa_free LDAP_P((ure_dfa_t dfa));
 
-extern void ure_write_dfa __((ure_dfa_t dfa, FILE *out));
+LDAP_LUNICODE_F (void) ure_write_dfa LDAP_P((ure_dfa_t dfa, FILE *out));
 
-extern int ure_exec __((ure_dfa_t dfa, int flags,
-                        ucs2_t *text, unsigned long textlen,
-                        unsigned long *match_start, unsigned long *match_end));
+LDAP_LUNICODE_F (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 +144,10 @@ 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));
+LDAP_LUNICODE_F (ucs4_t) _ure_tolower LDAP_P((ucs4_t c));
 
-#undef __
+LDAP_LUNICODE_F (int)
+_ure_matches_properties LDAP_P((unsigned long props, ucs4_t c));
 
 LDAP_END_DECL