x86inc: Improve FMA instruction handling

[x264] / extras / getopt.c

diff --git a/extras/getopt.c b/extras/getopt.c
index a890fde56ae92d92eb132c3d6c878cfc592fe0fc..434efe7e71e57b0123a1e03ddb73908857cfe2d5 100644 (file)
--- a/extras/getopt.c
+++ b/extras/getopt.c
@@ -202,11 +202,7 @@ static char *posixly_correct;
 # if HAVE_STRING_H
 #  include <string.h>
 # else
-#  ifdef _MSC_VER
-#   include <string.h>
-#  else
-#   include <strings.h>
-#  endif
+#  include <strings.h>
 # endif
 
 /* Avoid depending on library functions or files
@@ -984,16 +980,16 @@ getopt (argc, argv, optstring)
                           0);
 }
 
-#ifdef _MSC_VER
-
-int
-getopt_long (argc, argv, optstring, long_options, opt_index)
+int getopt_long (argc, argv, optstring, long_options, opt_index)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+     const struct option *long_options;
+     int *opt_index;
 {
   return _getopt_internal (argc, argv, optstring, long_options, opt_index, 0);
 }
 
-#endif
-
 #endif /* Not ELIDE_CODE.  */
 \f
 #ifdef TEST