memcmp replacement fixes

[openldap] / include / getopt-compat.h

diff --git a/include/getopt-compat.h b/include/getopt-compat.h
index b82dc9fd8cf8e9ad126bbdebc2c2cd8d17b2166f..b1c67670a8610e8d2a211240157edf3c1124b231 100644 (file)
--- a/include/getopt-compat.h
+++ b/include/getopt-compat.h
@@ -1,3 +1,19 @@
+/* getopt-compat.h -- getopt(3) compatibility header */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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>.
+ */
+
 /*
  * getopt(3) declarations
  */
@@ -6,9 +22,19 @@
 
 #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
+
+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_F int getopt LDAP_P((int, char * const [], const char *));
+LDAP_END_DECL
 
 #endif /* _GETOPT_COMPAT_H */