diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:02:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:02:24 +0000 |
| commit | 3a0754549f9c907fb9c761866dbc292bd62cf7c7 (patch) | |
| tree | 2c62e261ff083027ebdc328a2cc3d0c2a9ccd49a /python | |
| parent | dee6e8ffcb54ab0b4d5ec5373c84688006ce3cc4 (diff) | |
INTEGRATION: CWS warnings01 (1.6.10); FILE MERGED
2006/05/24 11:09:25 sb 1.6.10.5: #i53898# Fixed merge 1.10.6.2, which left (harmless) conflict markers in the file.
2006/04/07 21:23:44 sb 1.6.10.4: RESYNC: (1.9-1.10); FILE MERGED
2006/01/26 16:57:20 sb 1.6.10.3: #i53898# Fixed previous merge.
2006/01/25 22:13:27 sb 1.6.10.2: RESYNC: (1.6-1.9); FILE MERGED
2005/09/09 15:27:01 sb 1.6.10.1: #i53898# Made code warning-free.
Diffstat (limited to 'python')
| -rwxr-xr-x | python/Python-2.3.4.patch | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/python/Python-2.3.4.patch b/python/Python-2.3.4.patch index bd33854b03cf..b840bac377f4 100755 --- a/python/Python-2.3.4.patch +++ b/python/Python-2.3.4.patch @@ -979,22 +979,19 @@ *** misc/Python-2.3.4/Include/pyport.h Tue Sep 30 16:56:50 2003 --- misc/build/Python-2.3.4/Include/pyport.h Thu Sep 1 19:40:57 2005 *************** -*** 346,352 **** +*** 346,356 **** in platform-specific #ifdefs. **************************************************************************/ -! #ifdef SOLARIS +- #ifdef SOLARIS +- /* Unchecked */ +- extern int gethostname(char *, int); +- #endif +- + #ifdef __BEOS__ /* Unchecked */ - extern int gethostname(char *, int); - #endif ---- 346,352 ---- - in platform-specific #ifdefs. - **************************************************************************/ - -! #if defined(SOLARIS) && !defined(__GNUC__) - /* Unchecked */ - extern int gethostname(char *, int); - #endif + /* It's in the libs, but not the headers... - [cjh] */ +--- 346,351 ---- *** misc/Python-2.3.4/Mac/OSX/Makefile Tue Nov 4 23:45:16 2003 --- misc/build/Python-2.3.4/Mac/OSX/Makefile Thu Sep 1 19:40:57 2005 *************** |