diff options
| author | rillig <rillig> | 2005-04-12 01:10:45 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-04-12 01:10:45 +0000 |
| commit | ef9f81d876338281e25900cec340252fed9c69a3 (patch) | |
| tree | 1d0fa01ff4de72373740306dd491aca51bdc532e /misc | |
| parent | 8b39e0b55aed591b6a6afaebc7c361aedab24b13 (diff) | |
| download | pkgsrc-ef9f81d876338281e25900cec340252fed9c69a3.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')
| -rw-r--r-- | misc/openoffice/distinfo | 4 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-aw | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index df58eeb6bf6..b516ec3d41c 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2005/02/26 16:07:46 mrauch Exp $ +$NetBSD: distinfo,v 1.30 2005/04/12 01:10:45 rillig Exp $ SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430 RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587 @@ -52,6 +52,6 @@ SHA1 (patch-as) = 71d4d5a1517274ed9aff3e6c2bd89265772c93af SHA1 (patch-at) = f38552d47fbbc1013b00a29b5c451607236b2b84 SHA1 (patch-au) = 662e14be36e28aacf0bb3961c194c69d39cef8a8 SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8 -SHA1 (patch-aw) = 15a27595dbf7599943ff9847e4841b1b62e792a6 +SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1 SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364 SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849 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); + |