X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fgetopt-compat.h;h=8b5ee619694b523c62e68f50caf8e6b7d354858f;hb=760f527af2d97f3aa744222e10905d356ef4fe06;hp=24fbbb5a87836c417accd99cb06ad663663be030;hpb=0991e22550247e142a5e10dee3c7e29dbb8af7e1;p=openldap

diff --git a/include/getopt-compat.h b/include/getopt-compat.h
index 24fbbb5a87..8b5ee61969 100644
--- a/include/getopt-compat.h
+++ b/include/getopt-compat.h
@@ -1,13 +1,19 @@
+/* getopt-compat.h -- getopt(3) compatibility header */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * 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 in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 /*
  * getopt(3) declarations
  */
@@ -18,23 +24,16 @@
 
 LDAP_BEGIN_DECL
 
-extern char *optarg;
-extern int optind, opterr, optopt;
-
-#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
+/* 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_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