diff options
| author | agc <agc> | 2005-01-03 08:07:24 +0000 |
|---|---|---|
| committer | agc <agc> | 2005-01-03 08:07:24 +0000 |
| commit | d124a0f23703ae2652969dab52a19ccd1a4a98d2 (patch) | |
| tree | ba864a6adad78c720d46679898ff3e75281bc626 /misc/openoffice/patches/patch-ad | |
| parent | f20b513f9e05745ed89e0d1ed65dbdf7517e5c8a (diff) | |
| download | pkgsrc-d124a0f23703ae2652969dab52a19ccd1a4a98d2.tar.gz | |
Patches from Rui-Xiang Guo for building on NetBSD-current
Diffstat (limited to 'misc/openoffice/patches/patch-ad')
| -rw-r--r-- | misc/openoffice/patches/patch-ad | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/misc/openoffice/patches/patch-ad b/misc/openoffice/patches/patch-ad index 11e5691e818..56988e42715 100644 --- a/misc/openoffice/patches/patch-ad +++ b/misc/openoffice/patches/patch-ad @@ -1,8 +1,33 @@ -$NetBSD: patch-ad,v 1.2 2004/05/03 20:56:36 mrauch Exp $ +$NetBSD: patch-ad,v 1.3 2005/01/03 08:07:26 agc Exp $ ---- ../sal/osl/unx/system.c.orig 2004-04-17 19:24:56.000000000 +0200 -+++ ../sal/osl/unx/system.c -@@ -460,7 +460,7 @@ struct hostent *gethostbyname_r(const ch +Patch from Rui-Xiang Guo for building on NetBSD-current + +--- ../sal/osl/unx/system.c.orig 2003-07-17 01:21:47.000000000 +0800 ++++ ../sal/osl/unx/system.c 2004-11-19 10:46:49.000000000 +0800 +@@ -97,8 +97,11 @@ + struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size ) + #endif /* BUILD_OS_APPLEOSX */ + #else /* MACOSX */ ++#if (__NetBSD_Version__ < 200000000) + struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size ) ++#endif + #endif /* MACOSX */ ++#if (__NetBSD_Version__ < 200000000) + { + struct passwd* res; + +@@ -164,8 +167,9 @@ + return(res); + #endif /* MACOSX */ + } ++#endif + +-#if defined(NETBSD) || defined(MACOSX) ++#if defined(NETBSD) && (__NetBSD_Version__ < 200000000) || defined(MACOSX) + int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, + size_t buflen, struct passwd **result) + { +@@ -460,7 +464,7 @@ return res; } @@ -11,7 +36,7 @@ $NetBSD: patch-ad,v 1.2 2004/05/03 20:56:36 mrauch Exp $ /* * This section works around calls that are missing or broken * in MacOS X 10.1.x and earlier. -@@ -504,6 +504,10 @@ int readdir_r( DIR *dirp, struct dirent +@@ -504,6 +508,10 @@ return nRet; } |