[Libreoffice-commits] .: external/glibc-2.1.3.patch

[Tor Lillqvist]

 external/glibc-2.1.3.patch |   41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

New commits:
commit d56d6d239f65eeba59737dfa9db79745ae4d0c0e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jun 21 13:00:06 2011 +0300

    Simplify MinGW crack
    
    Avoid copy-pasting. Just change the pointless use of
    double-underscore-prefixed identifiers __argc and __argv in the getopt
    prototypes (which clashes with stuff from MinGW's stdlib.h,
    apparently) to plain argc and argv for all platforms.

diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index dddc22a..49f570d 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -46,34 +46,33 @@
 +
 --- 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
-@@ -137,6 +137,19 @@
+@@ -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
-+#  ifdef __MINGW32__
-+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,
-+			     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,
-+			     const char *__shortopts,
-+		             const struct option *__longopts, int *__longind,
-+			     int __long_only);
-+#  else
- extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
+-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,
-@@ -148,6 +161,7 @@
+-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);
-+#  endif
- # endif
- #else /* not __STDC__ */
- extern int getopt ();
 --- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
 @@ -1 +1,70 @@