[svn] assuan - r342 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2010-01-05 06:05:16 +0100 (Tue, 05 Jan 2010)
New Revision: 342

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/assuan-uds.c
Log:
2010-01-05  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac (_DARWIN_C_SOURCE): Define on frapple.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-01-05 04:09:05 UTC (rev 341)
+++ trunk/ChangeLog	2010-01-05 05:05:16 UTC (rev 342)
@@ -1,3 +1,7 @@
+2010-01-05  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac (_DARWIN_C_SOURCE): Define on frapple.
+
 2009-12-22  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac: Do not use echo -n.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-01-05 04:09:05 UTC (rev 341)
+++ trunk/configure.ac	2010-01-05 05:05:16 UTC (rev 342)
@@ -92,6 +92,7 @@
         ;;
     *-apple-darwin*)
         AC_DEFINE(_XOPEN_SOURCE, 500, Activate POSIX interface on MacOS X)
+        AC_DEFINE(_DARWIN_C_SOURCE, 1, Activate CMSG_LEN/CMSG_SPACE on MacOS X)
         ;;
 esac
 

Modified: trunk/src/assuan-uds.c
===================================================================
--- trunk/src/assuan-uds.c	2010-01-05 04:09:05 UTC (rev 341)
+++ trunk/src/assuan-uds.c	2010-01-05 05:05:16 UTC (rev 342)
@@ -45,7 +45,9 @@
 
 #ifdef USE_DESCRIPTOR_PASSING
 /* Provide replacement for missing CMSG maccros.  We assume that
-   size_t matches the alignment requirement. */
+   size_t matches the alignment requirement.  NOTE: This is not true
+   on Mac OS X, so be extra careful to define _DARWIN_C_SOURCE to get
+   those definitions instead of using these.  */
 #define MY_ALIGN(n) ((((n))+ sizeof(size_t)-1) & (size_t)~(sizeof(size_t)-1))
 #ifndef CMSG_SPACE
 #define CMSG_SPACE(n) (MY_ALIGN(sizeof(struct cmsghdr)) + MY_ALIGN((n)))