4 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index dc3a75db..d25c2343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-05  Werner Koch  <wk@g10code.com>
+
+	* configure.ac: Test for sys/msg.h.
+
 2009-04-23  Werner Koch  <wk@g10code.com>
 
 	* README: Add a section on build problems.
diff --git a/configure.ac b/configure.ac
index 756cf11d..76ba205a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -571,7 +571,7 @@ AC_SEARCH_LIBS(setsockopt, [nsl])
 ##################################
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h sys/select.h)
+AC_CHECK_HEADERS(unistd.h sys/select.h sys/msg.h)
 
 ##########################################
 #### Checks for typedefs, structures, ####
diff --git a/src/ChangeLog b/src/ChangeLog
index f7bcc628..6b22caf8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-05  Werner Koch  <wk@g10code.com>
+
+	* ath.h: Include sys/msg.h.
+
 2009-07-02  Werner Koch  <wk@g10code.com>
 
 	* fips.c (_gcry_initialize_fips_mode): Do not use FIPS mode if
diff --git a/src/ath.h b/src/ath.h
index be7444d8..68e2ef6b 100644
--- a/src/ath.h
+++ b/src/ath.h
@@ -32,6 +32,9 @@
 #  include <sys/time.h>
 # endif
 # include <sys/types.h>
+# ifdef HAVE_SYS_MSG_H
+#  include <sys/msg.h>  /* (e.g. for zOS) */
+# endif
 # include <sys/socket.h>
 #endif /* !_WIN32 */
 #include <gpg-error.h>