Define INFTIM if not in <poll.h>

[openldap] / include / ldif.h

diff --git a/include/ldif.h b/include/ldif.h
index 901fb58e7083a39adfbc0a612078e25c0d933f9b..0dc1a30b851fb9d773f1251629b032e7e5738c19 100644 (file)
--- a/include/ldif.h
+++ b/include/ldif.h
@@ -1,15 +1,18 @@
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * 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>.
  */
-
-/* Portions
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -27,7 +30,8 @@
 
 LDAP_BEGIN_DECL
 
-extern int ldif_debug;
+/* This is NOT a bogus extern declaration (unlike ldap_debug) */
+LDAP_LDIF_V (int) ldif_debug;
 
 #define LDIF_LINE_WIDTH      76      /* maximum length of LDIF lines */
 
@@ -48,23 +52,23 @@ extern int ldif_debug;
     ((nlen) + 4 + LDIF_BASE64_LEN(vlen) \
     + ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / LDIF_LINE_WIDTH * 2 ))
 
-LDAP_F( int )
+LDAP_LDIF_F( int )
 ldif_parse_line LDAP_P((
        LDAP_CONST char *line,
        char **name,
        char **value,
        ber_len_t *vlen ));
 
-LDAP_F( int )
+LDAP_LDIF_F( int )
 ldif_fetch_url LDAP_P((
        LDAP_CONST char *line,
        char **value,
        ber_len_t *vlen ));
 
-LDAP_F( char * )
+LDAP_LDIF_F( char * )
 ldif_getline LDAP_P(( char **next ));
 
-LDAP_F( int )
+LDAP_LDIF_F( int )
 ldif_read_record LDAP_P((
        FILE *fp,
        int *lineno,
@@ -82,7 +86,7 @@ ldif_read_record LDAP_P((
 #define LDIF_PUT_URL           0x0020  /* url */
 #define LDIF_PUT_SEP           0x0040  /* separator */
 
-LDAP_F( void )
+LDAP_LDIF_F( void )
 ldif_sput LDAP_P((
        char **out,
        int type,
@@ -90,14 +94,14 @@ ldif_sput LDAP_P((
        LDAP_CONST char *val,
        ber_len_t vlen ));
 
-LDAP_F( char * )
+LDAP_LDIF_F( char * )
 ldif_put LDAP_P((
        int type,
        LDAP_CONST char *name,
        LDAP_CONST char *val,
        ber_len_t vlen ));
 
-LDAP_F( int )
+LDAP_LDIF_F( int )
 ldif_is_not_printable LDAP_P((
        LDAP_CONST char *val,
        ber_len_t vlen ));