diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-20 09:15:26 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-21 07:44:38 +0000 |
| commit | cabd23916f3057b2c5f40aae0df6360342b6ea46 (patch) | |
| tree | d90eb089dfeba0309ce45d577f7f72809f92a821 /external/glibc | |
| parent | WaE: unknown log area (diff) | |
| download | core-cabd23916f3057b2c5f40aae0df6360342b6ea46.tar.gz core-cabd23916f3057b2c5f40aae0df6360342b6ea46.zip | |
We don't seem to actually need glibc getopt
Change-Id: I1f221533f5ea684d113bdc45c04bf84405140f9f
Reviewed-on: https://gerrit.libreoffice.org/5539
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/glibc')
| -rw-r--r-- | external/glibc/glibc-2.1.3.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/external/glibc/glibc-2.1.3.patch b/external/glibc/glibc-2.1.3.patch deleted file mode 100644 index a9feeccc4f67..000000000000 --- a/external/glibc/glibc-2.1.3.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- misc/glibc-2.1.3/posix/getopt.h Sun Aug 27 16:11:33 2000 -+++ misc/build/glibc-2.1.3/posix/getopt.h Mon Mar 31 09:42:01 2008 -@@ -131,7 +131,7 @@ - /* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ --extern int getopt (int __argc, char *const *__argv, const char *__shortopts); -+extern int getopt (int argc, char *const *argv, const char *shortopts); - # else /* not __GNU_LIBRARY__ */ - extern int getopt (); - # endif /* __GNU_LIBRARY__ */ -@@ -137,14 +137,14 @@ - # endif /* __GNU_LIBRARY__ */ - - # ifndef __need_getopt --extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts, -+extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *__longopts, int *__longind); --extern int getopt_long_only (int __argc, char *const *__argv, -+extern int getopt_long_only (int argc, char *const *argv, - const char *__shortopts, - const struct option *__longopts, int *__longind); - - /* Internal only. Users should not call this directly. */ --extern int _getopt_internal (int __argc, char *const *__argv, -+extern int _getopt_internal (int argc, char *const *argv, - const char *__shortopts, - const struct option *__longopts, int *__longind, - int __long_only); ---- misc/glibc-2.1.3/posix/getopt1.c -+++ misc/build/glibc-2.1.3/posix/getopt1.c -@@ -62,6 +62,13 @@ - #ifndef NULL - #define NULL 0 - #endif -+ -+#ifdef _MSC_VER -+// C4100: unreferenced formal parameter -+#pragma warning (disable: 4100) -+// C4131: uses old-style declarator -+#pragma warning (disable: 4131) -+#endif - - int - getopt_long (argc, argv, options, long_options, opt_index) - ---- misc/glibc-2.1.3/posix/getopt.c -+++ misc/build/glibc-2.1.3/posix/getopt.c -@@ -86,6 +86,13 @@ - # define _(msgid) (msgid) - # endif - #endif -+ -+#ifdef _MSC_VER -+// C4100: unreferenced formal parameter -+#pragma warning (disable: 4100) -+// C4131: uses old-style declarator -+#pragma warning (disable: 4131) -+#endif - - /* This version of `getopt' appears to the caller like standard Unix `getopt' - but it behaves differently for the user, since it allows the user - |