blob: d87b835d7557bd0ca8d48383a2ebb355665e6bb1 (
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
|
--- spice/common/src/include/util.h.orig Sun Jan 30 04:14:24 1994
+++ spice/common/src/include/util.h Sat Dec 23 19:48:50 2006
@@ -6,6 +6,10 @@
#ifndef UTIL
#define UTIL
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+
/* #define MALLOC(x) calloc(1,(unsigned)(x)) */
#define MALLOC(x) tmalloc((unsigned)(x))
#define FREE(x) {if (x) {free((char *)(x));(x) = 0;}}
@@ -18,8 +22,10 @@
#include <stdlib.h>
#endif
#else
+/*
extern char *malloc();
extern char *calloc();
+*/
extern char *realloc();
extern void free();
#endif
@@ -44,8 +50,10 @@
#endif
/* XXX Move these into the above ifdef someday */
+#if !(defined(BSD) && (BSD >= 199306))
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
#define SIGN(a,b) ( b >= 0 ? (a >= 0 ? a : - a) : (a >= 0 ? - a : a))
#define ABORT() fflush(stderr);fflush(stdout);abort();
|
