diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-08-07 10:06:41 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-08-07 10:06:41 +0000 |
| commit | 9e89958c70f60831ac6002ca3da5dbc4dcf4363c (patch) | |
| tree | 776cfa4077dd9e9e23b6c47313fa3effc178eaa2 /editors/openoffice.org-2.0-devel/files | |
| parent | - Update MASTER_SITES (diff) | |
o Update to SRC680_m180
o discard __FreeBSD_version < 700015 since get*_r is MFC'ed to 601103[1]
Discussed with: ume[1]
Notes
Notes:
svn path=/head/; revision=169947
Diffstat (limited to 'editors/openoffice.org-2.0-devel/files')
| -rw-r--r-- | editors/openoffice.org-2.0-devel/files/patch-i67904 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i67904 b/editors/openoffice.org-2.0-devel/files/patch-i67904 index 51968a8b16fe..66d7d360a2ad 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-i67904 +++ b/editors/openoffice.org-2.0-devel/files/patch-i67904 @@ -10,7 +10,7 @@ diff -u -r1.26 socket.c char *buffer, int buflen, int *h_errnop) { -#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015)) -+#if defined(LINUX) || (defined(FREEBSD) && ((__FreeBSD_version >= 700015) || (__FreeBSD_version >= 601103))) ++#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, @@ -26,7 +26,7 @@ diff -u -r1.13 system.c #endif /* defined SCO */ -#if !defined(FREEBSD) || (__FreeBSD_version < 700015) -+#if !defined(FREEBSD) || (__FreeBSD_version < 700015) || (__FreeBSD_version < 601103) ++#if !defined(FREEBSD) || (__FreeBSD_version < 601103) extern int h_errno; @@ -42,7 +42,7 @@ diff -u -r1.33 system.h 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) ++#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 < 700015) */ @@ -58,7 +58,8 @@ diff -u -r1.11 mozilla-source-1.7.5.patch -#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)) +++ (defined(__FreeBSD__) && __FreeBSD_version > 601103) #define _PR_HAVE_GETPROTO_R #define _PR_HAVE_5_ARG_GETPROTO_R #endif + |