ITS#4707 added new ldap_init_fd() API

[openldap] / libraries / liblunicode / ucdata / ucpgba.h

diff --git a/libraries/liblunicode/ucdata/ucpgba.h b/libraries/liblunicode/ucdata/ucpgba.h
index cd4c8bdd3fdbc2e456b54039f18ce8b2dcdac6f5..75702fbc1966f07ce73275b5ffeb72ecb60de700 100644 (file)
--- a/libraries/liblunicode/ucdata/ucpgba.h
+++ b/libraries/liblunicode/ucdata/ucpgba.h
@@ -1,5 +1,18 @@
-/*
- * Copyright 1999 Computing Research Labs, New Mexico State University
+/* $OpenLDAP$ */
+/* 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 1999 Computing Research Labs, New Mexico State University
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,23 +32,14 @@
  * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+/* $Id: ucpgba.h,v 1.4 1999/11/19 15:24:30 mleisher Exp $ */
+
 #ifndef _h_ucpgba
 #define _h_ucpgba
 
-/*
- * $Id: ucpgba.h,v 1.4 1999/11/19 15:24:30 mleisher Exp $
- */
+#include "portable.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef __
-#ifdef __STDC__
-#define __(x) x
-#else
-#define __(x) ()
-#endif
+LDAP_BEGIN_DECL
 
 /***************************************************************************
  *
@@ -112,21 +116,23 @@ typedef struct _ucstring_t {
  * of a string containing no strong direction characters and the default
  * cursor motion should be provided.
  */
-extern ucstring_t *ucstring_create __((unsigned long *source,
-                                       unsigned long start,
-                                       unsigned long end,
-                                       int default_direction,
-                                       int cursor_motion));
+LDAP_LUNICODE_F (ucstring_t *)
+ucstring_create LDAP_P((unsigned long *source,
+                       unsigned long start,
+                       unsigned long end,
+                       int default_direction,
+                       int cursor_motion));
 /*
  * This releases the string.
  */
-extern void ucstring_free __((ucstring_t *string));
+LDAP_LUNICODE_F (void) ucstring_free LDAP_P((ucstring_t *string));
 
 /*
  * This changes the cursor motion flag for the string.
  */
-extern int ucstring_set_cursor_motion __((ucstring_t *string,
-                                          int cursor_motion));
+LDAP_LUNICODE_F (int)
+ucstring_set_cursor_motion LDAP_P((ucstring_t *string,
+                                  int cursor_motion));
 
 /*
  * This function will move the cursor to the right depending on the
@@ -135,7 +141,8 @@ extern int ucstring_set_cursor_motion __((ucstring_t *string,
  * A 0 is returned if no cursor motion is performed, otherwise a
  * 1 is returned.
  */
-extern int ucstring_cursor_right __((ucstring_t *string, int count));
+LDAP_LUNICODE_F (int)
+ucstring_cursor_right LDAP_P((ucstring_t *string, int count));
 
 /*
  * This function will move the cursor to the left depending on the
@@ -144,19 +151,17 @@ extern int ucstring_cursor_right __((ucstring_t *string, int count));
  * A 0 is returned if no cursor motion is performed, otherwise a
  * 1 is returned.
  */
-extern int ucstring_cursor_left __((ucstring_t *string, int count));
+LDAP_LUNICODE_F (int)
+ucstring_cursor_left LDAP_P((ucstring_t *string, int count));
 
 /*
  * This routine retrieves the direction of the run containing the cursor
  * and the actual position in the original text string.
  */
-extern void ucstring_cursor_info __((ucstring_t *string, int *direction,
-                                     unsigned long *position));
-
-#undef __
+LDAP_LUNICODE_F (void)
+ucstring_cursor_info LDAP_P((ucstring_t *string, int *direction,
+                            unsigned long *position));
 
-#ifdef __cplusplus
-}
-#endif
+LDAP_END_DECL
 
 #endif /* _h_ucpgba */