summaryrefslogtreecommitdiff
path: root/misc/openoffice/patches
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-04-12 01:10:45 +0000
committerrillig <rillig@pkgsrc.org>2005-04-12 01:10:45 +0000
commitc5af79384f803e40404cd74c9ff3e3ea07b43679 (patch)
tree1d0fa01ff4de72373740306dd491aca51bdc532e /misc/openoffice/patches
parent191194483c7b84e7b4c63beddcee37c471f39b05 (diff)
downloadpkgsrc-c5af79384f803e40404cd74c9ff3e3ea07b43679.tar.gz
Removed the declaration of getpwent_r(), which differs among different
operating systems. The function is never used in openoffice. Approved by phone.
Diffstat (limited to 'misc/openoffice/patches')
-rw-r--r--misc/openoffice/patches/patch-aw13
1 files changed, 11 insertions, 2 deletions
diff --git a/misc/openoffice/patches/patch-aw b/misc/openoffice/patches/patch-aw
index 7d390057865..521daf6fe3a 100644
--- a/misc/openoffice/patches/patch-aw
+++ b/misc/openoffice/patches/patch-aw
@@ -1,6 +1,7 @@
-$NetBSD: patch-aw,v 1.6 2005/01/03 22:51:47 agc Exp $
+$NetBSD: patch-aw,v 1.7 2005/04/12 01:10:45 rillig Exp $
-Patch from Rui-Xiang Guo for building on NetBSD-current
+Patch from Rui-Xiang Guo for building on NetBSD-current. The getpwent_r
+function is not used at all, so why provide a (wrong) prototype for it?
--- ../sal/osl/unx/system.h.orig 2004-11-19 09:23:53.000000000 +0800
+++ ../sal/osl/unx/system.h 2004-11-19 09:27:55.000000000 +0800
@@ -15,3 +16,11 @@ Patch from Rui-Xiang Guo for building on NetBSD-current
# define _POSIX_THREAD_SYSCALL_SOFT 1
# include <pthread.h>
# include <netdb.h>
+@@ -569,7 +572,6 @@ extern int sem_post(sem_t* sem);
+
+ #ifdef NO_PTHREAD_RTL
+ #if !defined FREEBSD || (__FreeBSD_version < 500112)
+-struct passwd *getpwent_r(struct passwd *pwd, char *buffer, int buflen);
+ extern struct spwd *getspnam_r(const char *name, struct spwd *result,
+ char *buffer, int buflen);
+