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
37
38
39
40
41
42
43
44
45
46
47
48
49
|
$NetBSD: patch-ad,v 1.3 2005/01/03 08:07:26 agc Exp $
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;
}
-#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.
@@ -504,6 +508,10 @@
return nRet;
}
+#endif
+
+#if defined(MACOSX)
+
/* No reentrant asctime() either... */
/*******************************************************************************/
|