summaryrefslogtreecommitdiff
path: root/misc/openoffice/patches/patch-aw
blob: 72d45467e435e73864337351a07bb07babcc7a14 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
$NetBSD: patch-aw,v 1.8 2008/01/25 20:56:57 rillig Exp $

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	2003-08-15 11:38:50.000000000 +0000
+++ ../sal/osl/unx/system.h	2008-01-25 19:15:07.000000000 +0000
@@ -169,7 +169,10 @@
 #endif
 
 #ifdef NETBSD
+#	include <sys/param.h>
+#  ifndef ETIME
 #	define  ETIME ETIMEDOUT
+#  endif
 #	define _POSIX_THREAD_SYSCALL_SOFT 1
 #	include <pthread.h>
 #	include <netdb.h>
@@ -482,7 +485,9 @@ void macxp_getSystemVersion( unsigned in
 #	define PTHREAD_VALUE(t) 			(t)
 #endif
 #ifndef PTHREAD_NONE
+# if (__GNUC__ < 4) && !defined(MACOSX)
 extern pthread_t _pthread_none_;
+# endif
 #	define PTHREAD_NONE					_pthread_none_
 #   ifndef PTHREAD_NONE_INIT
 #		define PTHREAD_NONE_INIT		((pthread_t)-1)
@@ -569,7 +574,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);