blob: 2a3cdf4e0754a62ada8121404a09559ecded4e34 (
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
37
38
39
40
41
42
43
44
|
$NetBSD: patch-af,v 1.7 2007/07/08 10:50:26 wiz Exp $
--- xv.h.orig 2007-06-08 07:24:51.000000000 +0000
+++ xv.h
@@ -138,9 +138,7 @@
#endif
-#if defined(__FreeBSD__)
-# include <sys/param.h>
-#endif
+#include <sys/param.h>
/* include files */
@@ -159,7 +157,7 @@
#ifndef VMS
# include <errno.h>
# ifndef __NetBSD__
-# if !(defined __GLIBC__ && __GLIBC__ >= 2)
+# if !(defined(BSD) && (BSD >= 199103)) && !(defined __GLIBC__ && __GLIBC__ >= 2)
extern int errno; /* SHOULD be in errno.h, but often isn't */
extern char *sys_errlist[]; /* this too... */
# endif
@@ -171,7 +169,7 @@
#ifdef VMS
# define ERRSTR(x) strerror(x, vaxc$errno)
#else
-# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
+# if defined(__BEOS__) || defined(__linux__) || defined(__INTERIX) /* or all modern/glibc systems? */
# define ERRSTR(x) strerror(x)
# else
# define ERRSTR(x) sys_errlist[x]
@@ -207,7 +205,9 @@
# if defined(hp300) || defined(hp800) || defined(NeXT)
# include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */
# else
-# include <malloc.h>
+# ifndef __DARWIN__
+# include <malloc.h>
+# endif
# endif
#endif
|