diff options
Diffstat (limited to 'misc/openoffice2/patches/patch-ad')
| -rw-r--r-- | misc/openoffice2/patches/patch-ad | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/misc/openoffice2/patches/patch-ad b/misc/openoffice2/patches/patch-ad index 950a41ff537..64465cadcbf 100644 --- a/misc/openoffice2/patches/patch-ad +++ b/misc/openoffice2/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.2 2007/03/04 13:11:18 hira Exp $ +$NetBSD: patch-ad,v 1.3 2007/10/06 20:02:22 hira Exp $ ---- sal/osl/unx/system.c.orig 2007-02-17 23:06:23.000000000 +0900 -+++ sal/osl/unx/system.c 2007-02-17 23:08:46.000000000 +0900 +--- sal/osl/unx/system.c.orig 2007-07-05 18:05:56.000000000 +0900 ++++ sal/osl/unx/system.c 2007-09-26 17:14:54.000000000 +0900 @@ -71,8 +71,11 @@ struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size ) #endif /* BUILD_OS_APPLEOSX */ @@ -21,20 +21,20 @@ $NetBSD: patch-ad,v 1.2 2007/03/04 13:11:18 hira Exp $ +#endif -#if defined(NETBSD) || defined(MACOSX) -+#if defined(NETBSD) && (__NetBSD_Version__ < 299001000) || defined(MACOSX) ++#if (defined(NETBSD) && (__NetBSD_Version__ < 299001000)) || defined(MACOSX) int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t buflen, struct passwd **result) { -@@ -437,7 +441,7 @@ +@@ -432,7 +436,7 @@ } - #endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */ + #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */ -#if defined(MACOSX) +#if defined(MACOSX) || defined(NETBSD) /* * This section works around calls that are missing or broken * in MacOS X 10.1.x and earlier. -@@ -481,6 +485,10 @@ +@@ -476,6 +480,10 @@ return nRet; } |