X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldif.h;h=f875ed1dd5b6f2e87f7550d6d53184f023e4ef93;hb=78066c08c0650e5b1e7e205946d409e3dd10e73b;hp=caba0b613e03a7e85529e96e8432bfa73fe443f5;hpb=0991e22550247e142a5e10dee3c7e29dbb8af7e1;p=openldap

diff --git a/include/ldif.h b/include/ldif.h
index caba0b613e..f875ed1dd5 100644
--- a/include/ldif.h
+++ b/include/ldif.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * 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 at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /* Portions
  * Copyright (c) 1996 Regents of the University of Michigan.
@@ -27,7 +28,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,32 +50,23 @@ extern int ldif_debug;
     ((nlen) + 4 + LDIF_BASE64_LEN(vlen) \
     + ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / LDIF_LINE_WIDTH * 2 ))
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLDIF_DECL
-#	define LDAP_F_PRE	extern __declspec(LIBLDIF_DECL)
-#   else
-#	define LDAP_F_PRE	extern
-#   endif
-#endif
-
-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,
@@ -91,7 +84,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,
@@ -99,14 +92,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 ));