diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 10:05:07 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 10:05:07 +0000 |
| commit | 358897823c987d248ecdf2e14aa74c479ccaff3a (patch) | |
| tree | 553c2fd895429993e87aff34ba031006aa0355d2 /external | |
| parent | a38ee14976e034a2fc4dbd7bb24d1c399c3c6b56 (diff) | |
INTEGRATION: CWS mingwport04 (1.3.6); FILE MERGED
2007/04/23 15:23:31 vg 1.3.6.1: #i75844# MinGW port efforts part 2
Diffstat (limited to 'external')
| -rw-r--r-- | external/glibc-2.1.3.patch | 54 |
1 files changed, 44 insertions, 10 deletions
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch index af79be4a7a86..27ba99efa26a 100644 --- a/external/glibc-2.1.3.patch +++ b/external/glibc-2.1.3.patch @@ -1,5 +1,5 @@ -*** misc/glibc-2.1.3/posix/config.h Tue Jan 30 15:33:39 2007 ---- misc/build/glibc-2.1.3/posix/config.h Tue Jan 30 15:25:00 2007 +*** misc/glibc-2.1.3/posix/config.h Mon Apr 23 17:19:26 2007 +--- misc/build/glibc-2.1.3/posix/config.h Mon Apr 23 17:18:49 2007 *************** *** 1 **** ! dummy @@ -10,9 +10,9 @@ ! * ! * $RCSfile: glibc-2.1.3.patch,v $ ! * -! * $Revision: 1.3 $ +! * $Revision: 1.4 $ ! * -! * last change: $Author: vg $ $Date: 2007-02-06 13:23:39 $ +! * last change: $Author: vg $ $Date: 2007-05-25 11:05:07 $ ! * ! * The Contents of this file are made available subject to ! * the terms of GNU Lesser General Public License Version 2.1. @@ -54,8 +54,42 @@ ! #endif ! ! -*** misc/glibc-2.1.3/posix/makefile.mk Tue Jan 30 15:33:38 2007 ---- misc/build/glibc-2.1.3/posix/makefile.mk Tue Jan 30 15:33:27 2007 +*** 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 Apr 23 17:18:49 2007 +*************** +*** 137,142 **** +--- 137,155 ---- + # 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, + const struct option *__longopts, int *__longind); + extern int getopt_long_only (int __argc, char *const *__argv, +*************** +*** 148,153 **** +--- 161,167 ---- + 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 Apr 23 17:19:26 2007 +--- misc/build/glibc-2.1.3/posix/makefile.mk Mon Apr 23 17:18:49 2007 *************** *** 1 **** ! dummy @@ -66,9 +100,9 @@ ! # ! # $RCSfile: glibc-2.1.3.patch,v $ ! # -! # $Revision: 1.3 $ +! # $Revision: 1.4 $ ! # -! # last change: $Author: vg $ $Date: 2007-02-06 13:23:39 $ +! # last change: $Author: vg $ $Date: 2007-05-25 11:05:07 $ ! # ! # The Contents of this file are made available subject to ! # the terms of GNU Lesser General Public License Version 2.1. @@ -131,8 +165,8 @@ ! # --- Targets ------------------------------------------------------ ! ! .INCLUDE : target.mk -*** misc/glibc-2.1.3/posix/readdir_r.c Tue Jan 30 15:33:39 2007 ---- misc/build/glibc-2.1.3/posix/readdir_r.c Tue Jan 30 15:25:00 2007 +*** misc/glibc-2.1.3/posix/readdir_r.c Mon Apr 23 17:19:26 2007 +--- misc/build/glibc-2.1.3/posix/readdir_r.c Mon Apr 23 17:18:49 2007 *************** *** 1 **** ! dummy |