Backport of rev [19371]

src/extras/getopt.c

@@ -30,9 +30,6 @@
 #define _NO_PROTO
 #endif
 
-/* Overkill. */
-#include <vlc/vlc.h>
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

src/misc/configuration.c

@@ -1535,7 +1535,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
      * Parse the command line options
      */
     opterr = 0;
-    optind = 1;
+    optind = 0; /* set to 0 to tell GNU getopt to reinitialize */
     while( ( i_cmd = getopt_long( *pi_argc, ppsz_argv, psz_shortopts,
                                   p_longopts, &i_index ) ) != EOF )
     {