git-svn: trunk@4897
Török Edvin authored on 2009/03/05 00:51:28... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Wed Mar 4 17:51:16 EET 2009 (edwin) |
|
2 |
+------------------------------------ |
|
3 |
+ * configure, m4/fdpassing.m4, shared/fdpassing.h: |
|
4 |
+ CMSG_SPACE/CMSG_LEN compat macros for Solaris 8 (bb #1439). |
|
5 |
+ |
|
1 | 6 |
Wed Mar 4 16:42:57 CET 2009 (acab) |
2 | 7 |
----------------------------------- |
3 | 8 |
* clamav-milter: fix the logic for RejectMsg |
... | ... |
@@ -22855,6 +22855,19 @@ cat >>conftest.$ac_ext <<_ACEOF |
22855 | 22855 |
#include <signal.h> |
22856 | 22856 |
#include <sys/socket.h> |
22857 | 22857 |
|
22858 |
+#if !defined CMSG_SPACE || !defined CMSG_LEN |
|
22859 |
+#ifndef ALIGN |
|
22860 |
+#define ALIGN(len) len |
|
22861 |
+#endif |
|
22862 |
+ |
|
22863 |
+#ifndef CMSG_SPACE |
|
22864 |
+#define CMSG_SPACE(len) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(len)) |
|
22865 |
+#endif |
|
22866 |
+ |
|
22867 |
+#ifndef CMSG_LEN |
|
22868 |
+#define CMSG_LEN(len) (ALIGN(sizeof(struct cmsghdr)) + len) |
|
22869 |
+#endif |
|
22870 |
+#endif |
|
22858 | 22871 |
|
22859 | 22872 |
#define TEST "test" |
22860 | 22873 |
|
... | ... |
@@ -23042,6 +23055,19 @@ cat >>conftest.$ac_ext <<_ACEOF |
23042 | 23042 |
#include <signal.h> |
23043 | 23043 |
#include <sys/socket.h> |
23044 | 23044 |
|
23045 |
+#if !defined CMSG_SPACE || !defined CMSG_LEN |
|
23046 |
+#ifndef ALIGN |
|
23047 |
+#define ALIGN(len) len |
|
23048 |
+#endif |
|
23049 |
+ |
|
23050 |
+#ifndef CMSG_SPACE |
|
23051 |
+#define CMSG_SPACE(len) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(len)) |
|
23052 |
+#endif |
|
23053 |
+ |
|
23054 |
+#ifndef CMSG_LEN |
|
23055 |
+#define CMSG_LEN(len) (ALIGN(sizeof(struct cmsghdr)) + len) |
|
23056 |
+#endif |
|
23057 |
+#endif |
|
23045 | 23058 |
|
23046 | 23059 |
#define TEST "test" |
23047 | 23060 |
|
... | ... |
@@ -16,6 +16,19 @@ $1 |
16 | 16 |
#include <signal.h> |
17 | 17 |
#include <sys/socket.h> |
18 | 18 |
|
19 |
+#if !defined CMSG_SPACE || !defined CMSG_LEN |
|
20 |
+#ifndef ALIGN |
|
21 |
+#define ALIGN(len) len |
|
22 |
+#endif |
|
23 |
+ |
|
24 |
+#ifndef CMSG_SPACE |
|
25 |
+#define CMSG_SPACE(len) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(len)) |
|
26 |
+#endif |
|
27 |
+ |
|
28 |
+#ifndef CMSG_LEN |
|
29 |
+#define CMSG_LEN(len) (ALIGN(sizeof(struct cmsghdr)) + len) |
|
30 |
+#endif |
|
31 |
+#endif |
|
19 | 32 |
|
20 | 33 |
#define TEST "test" |
21 | 34 |
|
... | ... |
@@ -32,6 +32,22 @@ |
32 | 32 |
#include <sys/un.h> |
33 | 33 |
#include <sys/uio.h> |
34 | 34 |
|
35 |
+/* Solaris 8 */ |
|
36 |
+#if !defined CMSG_SPACE || !defined CMSG_LEN |
|
37 |
+#ifndef ALIGN |
|
38 |
+#define ALIGN(len) len |
|
39 |
+#endif |
|
40 |
+ |
|
41 |
+#ifndef CMSG_SPACE |
|
42 |
+#define CMSG_SPACE(len) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(len)) |
|
43 |
+#endif |
|
44 |
+ |
|
45 |
+#ifndef CMSG_LEN |
|
46 |
+#define CMSG_LEN(len) (ALIGN(sizeof(struct cmsghdr)) + len) |
|
47 |
+#endif |
|
48 |
+#endif |
|
49 |
+ |
|
50 |
+ |
|
35 | 51 |
#endif |
36 | 52 |
#endif |
37 | 53 |
|