Fix select/yield

[openldap] / include / ldap_pvt_uc.h

diff --git a/include/ldap_pvt_uc.h b/include/ldap_pvt_uc.h
index 6a2e4af2642a38f9075fa1fd59c3c9031d999202..c8c2cde74612794af9cb2d661cd086bc87ea73f5 100644 (file)
--- a/include/ldap_pvt_uc.h
+++ b/include/ldap_pvt_uc.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -20,11 +20,7 @@
 
 #include <lber.h>                              /* get ber_slen_t */
 
-#ifdef _MSC_VER
 #include "../libraries/liblunicode/ucdata/ucdata.h"
-#else
-#include "../libraries/liblunicode/ucdata.h"
-#endif
 
 LDAP_BEGIN_DECL
 
@@ -39,6 +35,11 @@ typedef unsigned long ldap_unicode_t;
 #define ldap_utf8_to_unicode( p ) ldap_utf8_to_ucs4((p))
 #define ldap_unicode_to_utf8( c, buf ) ldap_ucs4_to_ucs4((c),(buf))
 
+/* Convert a string with csize octets per character to UTF-8 */
+LDAP_F( int ) ldap_ucs_to_utf8s LDAP_P((
+       struct berval *ucs, int csize, struct berval *utf8s ));
+
+
 /* returns the number of bytes in the UTF-8 string */
 LDAP_F (ber_len_t) ldap_utf8_bytes( const char * );
 /* returns the number of UTF-8 characters in the string */
@@ -146,12 +147,14 @@ LDAP_LUNICODE_F(void) ucstr2upper(
 LDAP_LUNICODE_F(struct berval *) UTF8bvnormalize(
        struct berval *,
        struct berval *,
-       unsigned );
+       unsigned,
+       void *memctx );
 
 LDAP_LUNICODE_F(int) UTF8bvnormcmp(
        struct berval *,
        struct berval *,
-       unsigned );
+       unsigned,
+       void *memctx );
 
 LDAP_END_DECL