If we are using lutil_lock functions then define NEED_SIMPLE_LOCKING or

[openldap] / libraries / liblutil / getopt.c

diff --git a/libraries/liblutil/getopt.c b/libraries/liblutil/getopt.c
index 112616fdceb4b717850c422831cf7eb5eb7190fc..c69bd17aa194c6fdcfd29d1a9abfa02e693a1681 100644 (file)
--- a/libraries/liblutil/getopt.c
+++ b/libraries/liblutil/getopt.c
@@ -14,12 +14,20 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO 2
+#endif
+
 int opterr = 1;
 int optind = 1;
 int optopt;
 char * optarg;
 
-static void ERR (char ** argv, char * s, char c)
+static void ERR (char * const argv[], const char * s, char c)
 {
        char errbuf[2];
 
@@ -36,7 +44,7 @@ printf("DF_TRACE_DEBUG:       static void ERR () in getopt.c\n");
        }
 }
 
-int getopt (int argc, char ** argv, char * opts)
+int getopt (int argc, char * const argv [], const char * opts)
 {
        static int sp = 1, error = (int) '?';
        static char sw = '-', eos = '\0', arg = ':';