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 a32e8b5b36618edab4c2bab31a7267a753c31d9f..ca23e4b7764077b599136a024475636d163423df 100644 (file)
--- a/include/getopt-compat.h
+++ b/include/getopt-compat.h
@@ -1,5 +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
@@ -15,9 +16,20 @@
 
 #include <ldap_cdefs.h>
 
-extern char *optarg;
-extern int optind, opterr, optopt;
+LDAP_BEGIN_DECL
 
-LDAP_F int getopt LDAP_P((int, char * const [], const char *));
+/* 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_END_DECL
 
 #endif /* _GETOPT_COMPAT_H */