pkgsrc/misc/openoffice2/patches/patch-ad

$NetBSD: patch-ad,v 1.3 2007/10/06 20:02:22 hira Exp $

--- 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 */
 #else /* MACOSX */
+#if (__NetBSD_Version__ < 299001000)
 struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
+#endif
 #endif /* MACOSX */
+#if (__NetBSD_Version__ < 299001000)
 {
   	struct passwd* res;
 
@@ -138,8 +141,9 @@
         return(res);
 #endif /* MACOSX */
 }
+#endif
 
-#if defined(NETBSD) || 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)
 {
@@ -432,7 +436,7 @@
 }
 #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.
@@ -476,6 +480,10 @@
     return nRet;
 }
 
+#endif
+
+#if defined(MACOSX)
+
 /* No reentrant asctime() either... */
 
 /*******************************************************************************/