mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-25 00:59:45 -05:00
s/__/LDAP_P/g
This commit is contained in:
Kurt Zeilenga
parent
733d6296a6
commit
10fd143311
4 changed files with 42 additions and 62 deletions
|
|
@ -33,9 +33,6 @@
|
|||
|
||||
LDAP_BEGIN_DECL
|
||||
|
||||
#undef __
|
||||
#define __(x) x
|
||||
|
||||
#define UCDATA_VERSION "2.4"
|
||||
|
||||
/**************************************************************************
|
||||
|
|
@ -116,7 +113,7 @@ LDAP_BEGIN_DECL
|
|||
* of properties. The macros that test for various character properties all
|
||||
* call this function with some set of masks.
|
||||
*/
|
||||
extern int ucisprop __((unsigned long code, unsigned long mask1,
|
||||
extern int ucisprop LDAP_P((unsigned long code, unsigned long mask1,
|
||||
unsigned long mask2));
|
||||
|
||||
#define ucisalpha(cc) ucisprop(cc, UC_LU|UC_LL|UC_LM|UC_LO|UC_LT, 0)
|
||||
|
|
@ -206,9 +203,9 @@ extern int ucisprop __((unsigned long code, unsigned long mask1,
|
|||
*
|
||||
**************************************************************************/
|
||||
|
||||
extern unsigned long uctoupper __((unsigned long code));
|
||||
extern unsigned long uctolower __((unsigned long code));
|
||||
extern unsigned long uctotitle __((unsigned long code));
|
||||
extern unsigned long uctoupper LDAP_P((unsigned long code));
|
||||
extern unsigned long uctolower LDAP_P((unsigned long code));
|
||||
extern unsigned long uctotitle LDAP_P((unsigned long code));
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
|
|
@ -221,20 +218,20 @@ extern unsigned long uctotitle __((unsigned long code));
|
|||
* If it returns 0, there is no composition. Any other value indicates a
|
||||
* composition was returned in comp.
|
||||
*/
|
||||
extern int uccomp __((unsigned long node1, unsigned long node2,
|
||||
extern int uccomp LDAP_P((unsigned long node1, unsigned long node2,
|
||||
unsigned long *comp));
|
||||
|
||||
/*
|
||||
* Does Hangul composition on the string str with length len, and returns
|
||||
* the length of the composed string.
|
||||
*/
|
||||
extern int uccomp_hangul __((unsigned long *str, int len));
|
||||
extern int uccomp_hangul LDAP_P((unsigned long *str, int len));
|
||||
|
||||
/*
|
||||
* Does canonical composition on the string str with length len, and returns
|
||||
* the length of the composed string.
|
||||
*/
|
||||
extern int uccanoncomp __((unsigned long *str, int len));
|
||||
extern int uccanoncomp LDAP_P((unsigned long *str, int len));
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
|
|
@ -247,14 +244,14 @@ extern int uccanoncomp __((unsigned long *str, int len));
|
|||
* there is no decomposition. Any other value indicates a decomposition was
|
||||
* returned.
|
||||
*/
|
||||
extern int ucdecomp __((unsigned long code, unsigned long *num,
|
||||
extern int ucdecomp LDAP_P((unsigned long code, unsigned long *num,
|
||||
unsigned long **decomp));
|
||||
|
||||
/*
|
||||
* If the code is a Hangul syllable, this routine decomposes it into the array
|
||||
* passed. The array size should be at least 3.
|
||||
*/
|
||||
extern int ucdecomp_hangul __((unsigned long code, unsigned long *num,
|
||||
extern int ucdecomp_hangul LDAP_P((unsigned long code, unsigned long *num,
|
||||
unsigned long decomp[]));
|
||||
|
||||
/*
|
||||
|
|
@ -263,7 +260,7 @@ extern int ucdecomp_hangul __((unsigned long code, unsigned long *num,
|
|||
* The memory for out is allocated by this routine. It returns the length
|
||||
* of the decomposed string if okay, and -1 on error.
|
||||
*/
|
||||
extern int uccanondecomp __((const unsigned long *in, int inlen,
|
||||
extern int uccanondecomp LDAP_P((const unsigned long *in, int inlen,
|
||||
unsigned long **out, int *outlen));
|
||||
|
||||
/**************************************************************************
|
||||
|
|
@ -276,7 +273,7 @@ extern int uccanondecomp __((const unsigned long *in, int inlen,
|
|||
* This will return the combining class for a character to be used with the
|
||||
* Canonical Ordering algorithm.
|
||||
*/
|
||||
extern unsigned long uccombining_class __((unsigned long code));
|
||||
extern unsigned long uccombining_class LDAP_P((unsigned long code));
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
|
|
@ -289,14 +286,14 @@ struct ucnumber {
|
|||
int denominator;
|
||||
};
|
||||
|
||||
extern int ucnumber_lookup __((unsigned long code, struct ucnumber *num));
|
||||
extern int ucdigit_lookup __((unsigned long code, int *digit));
|
||||
extern int ucnumber_lookup LDAP_P((unsigned long code, struct ucnumber *num));
|
||||
extern int ucdigit_lookup LDAP_P((unsigned long code, int *digit));
|
||||
|
||||
/*
|
||||
* For compatibility with John Cowan's "uctype" package.
|
||||
*/
|
||||
extern struct ucnumber ucgetnumber __((unsigned long code));
|
||||
extern int ucgetdigit __((unsigned long code));
|
||||
extern struct ucnumber ucgetnumber LDAP_P((unsigned long code));
|
||||
extern int ucgetdigit LDAP_P((unsigned long code));
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
|
|
@ -321,9 +318,9 @@ extern int ucgetdigit __((unsigned long code));
|
|||
/*
|
||||
* Functions to load, unload, and reload specific data files.
|
||||
*/
|
||||
extern int ucdata_load __((char *paths, int mask));
|
||||
extern void ucdata_unload __((int mask));
|
||||
extern int ucdata_reload __((char *paths, int mask));
|
||||
extern int ucdata_load LDAP_P((char *paths, int mask));
|
||||
extern void ucdata_unload LDAP_P((int mask));
|
||||
extern int ucdata_reload LDAP_P((char *paths, int mask));
|
||||
|
||||
#ifdef UCDATA_DEPRECATED
|
||||
/*
|
||||
|
|
@ -333,8 +330,6 @@ extern int ucdata_reload __((char *paths, int mask));
|
|||
#define ucdata_cleanup() ucdata_unload(UCDATA_ALL)
|
||||
#endif
|
||||
|
||||
#undef __
|
||||
|
||||
LDAP_END_DECL
|
||||
|
||||
#endif /* _h_ucdata */
|
||||
|
|
|
|||
|
|
@ -30,9 +30,6 @@
|
|||
|
||||
LDAP_BEGIN_DECL
|
||||
|
||||
#undef __
|
||||
#define __(x) x
|
||||
|
||||
/***************************************************************************
|
||||
*
|
||||
* Macros and types.
|
||||
|
|
@ -108,7 +105,7 @@ 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,
|
||||
extern ucstring_t *ucstring_create LDAP_P((unsigned long *source,
|
||||
unsigned long start,
|
||||
unsigned long end,
|
||||
int default_direction,
|
||||
|
|
@ -116,12 +113,12 @@ extern ucstring_t *ucstring_create __((unsigned long *source,
|
|||
/*
|
||||
* This releases the string.
|
||||
*/
|
||||
extern void ucstring_free __((ucstring_t *string));
|
||||
extern 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,
|
||||
extern int ucstring_set_cursor_motion LDAP_P((ucstring_t *string,
|
||||
int cursor_motion));
|
||||
|
||||
/*
|
||||
|
|
@ -131,7 +128,7 @@ 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));
|
||||
extern int ucstring_cursor_right LDAP_P((ucstring_t *string, int count));
|
||||
|
||||
/*
|
||||
* This function will move the cursor to the left depending on the
|
||||
|
|
@ -140,17 +137,15 @@ 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));
|
||||
extern 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,
|
||||
extern void ucstring_cursor_info LDAP_P((ucstring_t *string, int *direction,
|
||||
unsigned long *position));
|
||||
|
||||
#undef __
|
||||
|
||||
LDAP_END_DECL
|
||||
|
||||
#endif /* _h_ucpgba */
|
||||
|
|
|
|||
|
|
@ -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 ucs4_t _ure_tolower LDAP_P((ucs4_t c));
|
||||
|
||||
extern int _ure_matches_properties __((unsigned long props, ucs4_t c));
|
||||
|
||||
#undef __
|
||||
extern int _ure_matches_properties LDAP_P((unsigned long props, ucs4_t c));
|
||||
|
||||
LDAP_END_DECL
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@
|
|||
|
||||
LDAP_BEGIN_DECL
|
||||
|
||||
#undef __
|
||||
#define __(x) x
|
||||
|
||||
/*************************************************************************
|
||||
*
|
||||
* Types.
|
||||
|
|
@ -67,14 +64,14 @@ typedef struct _utbm_pattern_t *utbm_pattern_t;
|
|||
*
|
||||
*************************************************************************/
|
||||
|
||||
extern utbm_pattern_t utbm_create_pattern __((void));
|
||||
extern utbm_pattern_t utbm_create_pattern LDAP_P((void));
|
||||
|
||||
extern void utbm_free_pattern __((utbm_pattern_t pattern));
|
||||
extern void utbm_free_pattern LDAP_P((utbm_pattern_t pattern));
|
||||
|
||||
extern void utbm_compile __((ucs2_t *pat, unsigned long patlen,
|
||||
extern void utbm_compile LDAP_P((ucs2_t *pat, unsigned long patlen,
|
||||
unsigned long flags, utbm_pattern_t pattern));
|
||||
|
||||
extern int utbm_exec __((utbm_pattern_t pat, ucs2_t *text,
|
||||
extern int utbm_exec LDAP_P((utbm_pattern_t pat, ucs2_t *text,
|
||||
unsigned long textlen, unsigned long *match_start,
|
||||
unsigned long *match_end));
|
||||
|
||||
|
|
@ -84,19 +81,17 @@ extern int utbm_exec __((utbm_pattern_t pat, ucs2_t *text,
|
|||
*
|
||||
*************************************************************************/
|
||||
|
||||
extern int _utbm_isspace __((ucs4_t c, int compress));
|
||||
extern int _utbm_isspace LDAP_P((ucs4_t c, int compress));
|
||||
|
||||
extern int _utbm_iscntrl __((ucs4_t c));
|
||||
extern int _utbm_iscntrl LDAP_P((ucs4_t c));
|
||||
|
||||
extern int _utbm_nonspacing __((ucs4_t c));
|
||||
extern int _utbm_nonspacing LDAP_P((ucs4_t c));
|
||||
|
||||
extern ucs4_t _utbm_tolower __((ucs4_t c));
|
||||
extern ucs4_t _utbm_tolower LDAP_P((ucs4_t c));
|
||||
|
||||
extern ucs4_t _utbm_toupper __((ucs4_t c));
|
||||
extern ucs4_t _utbm_toupper LDAP_P((ucs4_t c));
|
||||
|
||||
extern ucs4_t _utbm_totitle __((ucs4_t c));
|
||||
|
||||
#undef __
|
||||
extern ucs4_t _utbm_totitle LDAP_P((ucs4_t c));
|
||||
|
||||
LDAP_END_DECL
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue