@@ -1,3 +1,8 @@

+Thu Feb 12 21:35:15 EET 2009 (edwin)

+------------------------------------

+ * shared/getopt.c, shared/getopt.h: make prototype compatible with

+ that declared in system headers. (bb #1383)

+

 Thu Feb 12 21:34:54 EET 2009 (edwin)

 ------------------------------------

  * libclamav/scanners.c: fix valgrind warning (bb #1371)

@@ -46,8 +46,9 @@ int getopt_reset(void)

 /* if you're porting some piece of UNIX software, this is all you need. */

 /* this supports GNU-style permution and optional arguments */

-int getopt(int argc, char * argv[], const char *opts)

+int getopt(int argc, char * const argvc[], const char *opts)

 {

+  char **argv = (char*)argvc;

   static int charind=0;

   const char *s;

   char mode, colon_mode;

@@ -34,7 +34,7 @@ extern "C" {

 extern int getopt_reset(void);

 /* UNIX-style short-argument parser */

-extern int getopt(int argc, char * argv[], const char *opts);

+extern int getopt(int argc, char * const argv[], const char *opts);

 extern int optind, opterr, optopt;

 extern char *optarg;