remove init arg from attrs_index_config proto

[openldap] / include / getopt-compat.h

diff --git a/include/getopt-compat.h b/include/getopt-compat.h
index b82dc9fd8cf8e9ad126bbdebc2c2cd8d17b2166f..ca23e4b7764077b599136a024475636d163423df 100644 (file)
--- a/include/getopt-compat.h
+++ b/include/getopt-compat.h
@@ -1,3 +1,13 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 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.
+ */
 /*
  * getopt(3) declarations
  */
@@ -6,9 +16,20 @@
 
 #include <ldap_cdefs.h>
 
-extern char *optarg;
-extern int optind, opterr, optopt;
+LDAP_BEGIN_DECL
+
+/* 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
+
+LIBLUTIL_F (char *) optarg;
+LIBLUTIL_F (int) optind, opterr, optopt;
+
+LIBLUTIL_F (int) getopt LDAP_P(( int, char * const [], const char *));
 
-LDAP_F int getopt LDAP_P((int, char * const [], const char *));
+LDAP_END_DECL
 
 #endif /* _GETOPT_COMPAT_H */