diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:39:22 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:39:22 +0000 |
| commit | 0ee06f90ee579f48c607aa9fed5923822b4f48ba (patch) | |
| tree | 38202b709039566425df3ab0d7d8a57a198d8c70 /sal | |
| parent | d38c449f2f010c99d874b025ae007acccf8e2b5c (diff) | |
INTEGRATION: CWS freebsd07 (1.25.118); FILE MERGED
2006/07/01 06:07:27 maho 1.25.118.1: #i65512#
FreeBSD >= 700015 support.\n This commit is a result of hacks at the CodeFest Akihabara 2006 hosted by FSIJ.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c index 502bf1f8e949..732bc9124e01 100644 --- a/sal/osl/unx/socket.c +++ b/sal/osl/unx/socket.c @@ -4,9 +4,9 @@ * * $RCSfile: socket.c,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:01:17 $ + * last change: $Author: kz $ $Date: 2006-07-19 09:39:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -813,7 +813,7 @@ static struct hostent* _osl_gethostbyname_r ( const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop) { -#ifdef LINUX +#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015)) struct hostent *__result; /* will be the same as result */ int __error; __error = gethostbyname_r (name, result, buffer, buflen, |