From baaee55979846a956eddf2b4efe03900f741441f Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Mon, 31 Jul 2006 01:36:37 +0000 Subject: Fix build for 6.1-STABLE --- editors/openoffice.org-2.0/files/patch-i65512 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'editors/openoffice.org-2.0/files/patch-i65512') diff --git a/editors/openoffice.org-2.0/files/patch-i65512 b/editors/openoffice.org-2.0/files/patch-i65512 index b37f2e47fa2d..31a5566f164a 100644 --- a/editors/openoffice.org-2.0/files/patch-i65512 +++ b/editors/openoffice.org-2.0/files/patch-i65512 @@ -5,7 +5,7 @@ char *buffer, int buflen, int *h_errnop) { -#ifdef LINUX -+#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015)) ++#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103))) struct hostent *__result; /* will be the same as result */ int __error; __error = gethostbyname_r (name, result, buffer, buflen, @@ -15,7 +15,7 @@ } #endif /* defined SCO */ -+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) ++#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103) + extern int h_errno; @@ -34,7 +34,7 @@ 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 < 700015) ++#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__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 < 700015) */ @@ -55,7 +55,7 @@ + +-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) ++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ -++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) +++ (defined(__FreeBSD__) && (__FreeBSD_version > 700016 || __FreeBSD_version > 601103)) + #define _PR_HAVE_GETPROTO_R + #define _PR_HAVE_5_ARG_GETPROTO_R + #endif -- cgit v1.2.3