blob: 0776bb463acba7c15c12349af1a5d51c99f8f943 (
plain) (
blame)
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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
--- src/util/catalog.c-- Thu Mar 5 03:19:12 1998
+++ src/util/catalog.c Fri Jul 3 15:47:35 1998
@@ -1,6 +1,13 @@
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
#ifndef _plan9_
#include <string.h>
+#if (!defined(BSD) || (BSD < 199506))
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <string.h>
#else
#include <u.h>
--- src/util/png.c-- Thu Mar 5 03:19:12 1998
+++ src/util/png.c Fri Jul 3 15:46:07 1998
@@ -1,3 +1,6 @@
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
#ifndef _plan9_
#include <aconfig.h>
#ifdef USE_PNG
@@ -5,7 +8,9 @@
#endif
#include <stdlib.h>
#include <stdio.h>
+#if (!defined(BSD) || (BSD < 199506))
#include <malloc.h>
+#endif
#include <errno.h>
#else
#include <u.h>
--- src/util/timers.c-- Fri Jul 3 16:35:49 1998
+++ src/util/timers.c Fri Jul 3 16:37:16 1998
@@ -21,17 +21,26 @@
*
* All ugly architecture depended timing code is separated into this file..
*/
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
#ifdef _plan9_
#include <u.h>
#include <stdio.h>
#include <libc.h>
#else
#include <aconfig.h>
+#if (!defined(BSD) || (BSD < 199506))
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <stdio.h>
#include <unistd.h>
#ifndef _MAC
+#if (!defined(BSD) || (BSD < 199506))
#include <malloc.h>
+#endif
#endif
#ifdef __BEOS__
#include <OS.h>
--- src/util/xstdio.c-- Thu Mar 5 03:19:12 1998
+++ src/util/xstdio.c Fri Jul 3 15:49:40 1998
@@ -1,6 +1,9 @@
+#if defined(HAVE_SYS_PARAM_H)
+#include <sys/param.h>
+#endif
#ifndef _plan9_
#include <string.h>
-#ifdef __EMX__
+#if (defined(__EMX__) || defined(BSD))
#include <sys/types.h>
#endif
#include <dirent.h>
|
