[Pkg-gnupg-commit] [libassuan] 287/437: 2010-01-05 Marcus Brinkmann <marcus at g10code.de>

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 808e43c06f1480d748fc85506f0463e6bb0bd7fd
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Tue Jan 5 05:05:16 2010 +0000

    2010-01-05  Marcus Brinkmann  <marcus at g10code.de>
    
    	* configure.ac (_DARWIN_C_SOURCE): Define on frapple.
---
 ChangeLog        | 4 ++++
 configure.ac     | 1 +
 src/assuan-uds.c | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ec21bfd..59130f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/configure.ac b/configure.ac
index 2b0e906..64f5d41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,7 @@ case "${host}" in
         ;;
     *-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
 
diff --git a/src/assuan-uds.c b/src/assuan-uds.c
index 1a5dec7..ffa940a 100644
--- a/src/assuan-uds.c
+++ b/src/assuan-uds.c
@@ -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)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git