diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-09-11 08:31:07 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-09-11 08:31:07 +0000 |
| commit | bc4d2e46fa04fef9476526a67f836352f769468e (patch) | |
| tree | c457f1dca9c49c72ba65a3ebb236e0ce00cc6dc9 /editors/openoffice.org-1.1/files/patch-gethostbyname_r | |
| parent | - BROKEN does not compile on sparc64 (diff) | |
1) Unbreak for __FreeBSD_version >= 601103
2) buildable/usable with JDK1.5
Patch is taken from http://wiki.linuxfromscratch.org/blfs/browser/trunk/patches/OOo_1.1.5-jdk_1.5.0_fix-1.patch?rev=5150&format=txt
Note: it doesn't break my policy (author must submit the JCA) since
this patch will never be integrated. OOo 1.1.x branch is closed.
Diffstat (limited to 'editors/openoffice.org-1.1/files/patch-gethostbyname_r')
| -rw-r--r-- | editors/openoffice.org-1.1/files/patch-gethostbyname_r | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/editors/openoffice.org-1.1/files/patch-gethostbyname_r b/editors/openoffice.org-1.1/files/patch-gethostbyname_r new file mode 100644 index 000000000000..63b243e146f9 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-gethostbyname_r @@ -0,0 +1,55 @@ +Index: sal/osl/unx/socket.c +=================================================================== +RCS file: /cvs/porting/sal/osl/unx/socket.c,v +retrieving revision 1.22.10.1 +diff -u -r1.22.10.1 socket.c +--- sal/osl/unx/socket.c 18 Aug 2003 15:12:26 -0000 1.22.10.1 ++++ sal/osl/unx/socket.c 10 Sep 2006 03:18:08 -0000 +@@ -836,7 +836,7 @@ + const char *name, struct hostent *result, + char *buffer, int buflen, int *h_errnop) + { +-#ifdef LINUX ++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) + struct hostent *__result; /* will be the same as result */ + int __error; + __error = gethostbyname_r (name, result, buffer, buflen, +Index: sal/osl/unx/system.c +=================================================================== +RCS file: /cvs/porting/sal/osl/unx/system.c,v +retrieving revision 1.8 +diff -u -r1.8 system.c +--- sal/osl/unx/system.c 16 Jul 2003 17:21:47 -0000 1.8 ++++ sal/osl/unx/system.c 10 Sep 2006 03:18:08 -0000 +@@ -371,6 +371,8 @@ + + extern int h_errno; + ++#if !defined(FREEBSD) || (__FreeBSD_version < 601103) ++ + struct hostent *gethostbyname_r(const char *name, struct hostent *result, + char *buffer, int buflen, int *h_errnop) + { +@@ -459,6 +461,8 @@ + + return res; + } ++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ ++ + + #if defined(MACOSX) + /* + +--- sal/osl/unx/system.h.orig Fri Aug 15 20:38:50 2003 ++++ sal/osl/unx/system.h Sun Sep 10 13:32:43 2006 +@@ -576,8 +576,10 @@ + struct tm *localtime_r(const time_t *timep, struct tm *buffer); + struct tm *gmtime_r(const time_t *timep, struct tm *buffer); + #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ ++#if !defined(FREEBSD) || (__FreeBSD_version < 601103) + struct hostent *gethostbyname_r(const char *name, struct hostent *result, + char *buffer, int buflen, int *h_errnop); ++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ + #endif + + #endif /* __OSL_SYSTEM_H__ */ |