protect multi-statement macros... ie: do { s1; s2; } while(0)

[openldap] / include / ldif.h

diff --git a/include/ldif.h b/include/ldif.h
index d42dfaec861eaa708e0a76cc5bdb3afa4a6f6acc..691c8bb52f6d45f8d4b527636a00e9b08a58bb7f 100644 (file)
--- a/include/ldif.h
+++ b/include/ldif.h
@@ -28,7 +28,7 @@ LDAP_BEGIN_DECL
 
 extern int ldif_debug;
 
-#define LINE_WIDTH      76      /* maximum length of LDIF lines */
+#define LDIF_LINE_WIDTH      76      /* maximum length of LDIF lines */
 
 /*
  * Macro to calculate maximum number of bytes that the base64 equivalent
@@ -45,12 +45,19 @@ extern int ldif_debug;
  */
 #define LDIF_SIZE_NEEDED(tlen,vlen) \
     ((tlen) + 4 + LDIF_BASE64_LEN(vlen) \
-    + ((LDIF_BASE64_LEN(vlen) + (tlen) + 3) / LINE_WIDTH * 2 ))
+    + ((LDIF_BASE64_LEN(vlen) + (tlen) + 3) / LDIF_LINE_WIDTH * 2 ))
 
-int ldif_parse_line LDAP_P(( char *line, char **type, char **value, int *vlen));
-char * ldif_getline LDAP_P(( char **next ));
-void ldif_put_type_and_value LDAP_P(( char **out, char *t, char *val, int vlen ));
-char *ldif_type_and_value LDAP_P(( char *type, char *val, int vlen ));
+LDAP_F int
+ldif_parse_line LDAP_P(( char *line, char **type, char **value, int *vlen));
+
+LDAP_F char *
+ldif_getline LDAP_P(( char **next ));
+
+LDAP_F void
+ldif_put_type_and_value LDAP_P(( char **out, char *t, char *val, int vlen ));
+
+LDAP_F char
+*ldif_type_and_value LDAP_P(( char *type, char *val, int vlen ));
 
 
 LDAP_END_DECL