blob: 08441be438cd3b6f549b7697a8dafbb1a1405449 (
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
|
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -130,14 +130,16 @@ void timersub(struct timeval *tvend, str
#include <errno.h>
-#ifdef SOLARIS
+#ifndef __BEGIN_DECLS
#define __BEGIN_DECLS
#define __END_DECLS
+#endif
#ifndef __P
#define __P(p) p
#endif
+#ifdef SOLARIS
#include <alloca.h>
#include <strings.h>
#include <pthread.h>
--- a/utils/db1-ast/include/db.h
+++ b/utils/db1-ast/include/db.h
@@ -68,8 +68,11 @@ typedef unsigned long long u_int64_t;
#endif /* __FreeBSD__ */
#endif
-#ifdef SOLARIS
+#ifndef __P
#define __P(p) p
+#endif
+
+#ifndef __BEGIN_DECLS
#define __BEGIN_DECLS
#define __END_DECLS
#endif
|
