Raise ldapi:// SSF to 71. ldapi:// is likely more secure than

[openldap] / include / getopt-compat.h

diff --git a/include/getopt-compat.h b/include/getopt-compat.h
index 24fbbb5a87836c417accd99cb06ad663663be030..e26c43e0ca5d9112ca627b094266f44c38e18a37 100644 (file)
--- a/include/getopt-compat.h
+++ b/include/getopt-compat.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -18,23 +18,16 @@
 
 LDAP_BEGIN_DECL
 
-extern char *optarg;
-extern int optind, opterr, optopt;
+/* change symbols to avoid clashing */
+#define optarg lutil_optarg
+#define optind lutil_optind
+#define opterr lutil_opterr
+#define optopt lutil_optopt
+#define getopt lutil_getopt
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLUTIL_DECL
-#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
-#   else
-#      define LDAP_F_PRE       extern
-#   endif
-#endif
-
-LDAP_F( int )
-getopt LDAP_P((
-       int,
-       char * const [],
-       const char *));
+LDAP_LUTIL_V (char *) optarg;
+LDAP_LUTIL_V (int) optind, opterr, optopt;
+LDAP_LUTIL_F (int) getopt LDAP_P(( int, char * const [], const char *));
 
 LDAP_END_DECL