external/glibc/glibc-2.1.3.patch

   1 --- misc/glibc-2.1.3/posix/getopt.h     Sun Aug 27 16:11:33 2000
   2 +++ misc/build/glibc-2.1.3/posix/getopt.h       Mon Mar 31 09:42:01 2008
   3 @@ -131,7 +131,7 @@
   4  /* Many other libraries have conflicting prototypes for getopt, with
   5     differences in the consts, in stdlib.h.  To avoid compilation
   6     errors, only prototype getopt for the GNU C library.  */
   7 -extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
   8 +extern int getopt (int argc, char *const *argv, const char *shortopts);
   9  # else /* not __GNU_LIBRARY__ */
  10  extern int getopt ();
  11  # endif /* __GNU_LIBRARY__ */
  12 @@ -137,14 +137,14 @@
  13  # endif /* __GNU_LIBRARY__ */
  14
  15  # ifndef __need_getopt
  16 -extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
  17 +extern int getopt_long (int argc, char *const *argv, const char *shortopts,
  18                         const struct option *__longopts, int *__longind);
  19 -extern int getopt_long_only (int __argc, char *const *__argv,
  20 +extern int getopt_long_only (int argc, char *const *argv,
  21                              const char *__shortopts,
  22                              const struct option *__longopts, int *__longind);
  23
  24  /* Internal only.  Users should not call this directly.  */
  25 -extern int _getopt_internal (int __argc, char *const *__argv,
  26 +extern int _getopt_internal (int argc, char *const *argv,
  27                              const char *__shortopts,
  28                              const struct option *__longopts, int *__longind,
  29                              int __long_only);
  30 --- misc/glibc-2.1.3/posix/getopt1.c
  31 +++ misc/build/glibc-2.1.3/posix/getopt1.c
  32 @@ -62,6 +62,13 @@
  33  #ifndef        NULL
  34  #define NULL 0
  35  #endif
  36 +
  37 +#ifdef _MSC_VER
  38 +// C4100: unreferenced formal parameter
  39 +#pragma warning (disable: 4100)
  40 +// C4131: uses old-style declarator
  41 +#pragma warning (disable: 4131)
  42 +#endif
  43
  44  int
  45  getopt_long (argc, argv, options, long_options, opt_index)
  46
  47 --- misc/glibc-2.1.3/posix/getopt.c
  48 +++ misc/build/glibc-2.1.3/posix/getopt.c
  49 @@ -86,6 +86,13 @@
  50  #  define _(msgid)     (msgid)
  51  # endif
  52  #endif
  53 +
  54 +#ifdef _MSC_VER
  55 +// C4100: unreferenced formal parameter
  56 +#pragma warning (disable: 4100)
  57 +// C4131: uses old-style declarator
  58 +#pragma warning (disable: 4131)
  59 +#endif
  60
  61  /* This version of `getopt' appears to the caller like standard Unix `getopt'
  62     but it behaves differently for the user, since it allows the user
  63