Always build and use "our" getopt

[vlc] / src / extras / getopt1.c

diff --git a/src/extras/getopt1.c b/src/extras/getopt1.c
index 5a7be9298c9d5afa601dd14c2fee2e3980e8f7db..b846efce1b394bb4ad463e8093f55ea83a20de60 100644 (file)
--- a/src/extras/getopt1.c
+++ b/src/extras/getopt1.c
@@ -51,8 +51,6 @@
 #endif
 #endif
 
-#ifndef ELIDE_CODE
-
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
 #ifdef __GNU_LIBRARY__
@@ -64,7 +62,7 @@
 #endif
 
 int
-    getopt_long(argc, argv, options, long_options, opt_index)
+    vlc_getopt_long(argc, argv, options, long_options, opt_index)
      int argc;
      char *const *argv;
      const char *options;
@@ -89,8 +87,6 @@ int
 {
     return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
 }
-
-#endif /* Not ELIDE_CODE.  */
 \f
 #ifdef TEST
 
@@ -108,7 +104,7 @@ int
     {
         int this_option_optind = optind ? optind : 1;
         int option_index = 0;
-        static struct option long_options[] =
+        static const struct option long_options[] =
         {
             {"add", 1, 0, 0},
             {"append", 0, 0, 0},