summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-06-17 15:33:13 +0000
committerGerald Carter <jerry@samba.org>2002-06-17 15:33:13 +0000
commit7b60e2304052c5603740ea11ce1345a32e1b9175 (patch)
tree121a6e788e22d5c46627050b8b9848aaf1896084 /source3/include/includes.h
parentaaf43bbc8fc113527cb4bb6da5fa9be06b2a1548 (diff)
downloadsamba-7b60e2304052c5603740ea11ce1345a32e1b9175.tar.gz
samba-7b60e2304052c5603740ea11ce1345a32e1b9175.tar.bz2
samba-7b60e2304052c5603740ea11ce1345a32e1b9175.zip
compile warngin fixes merged from 2.2
(This used to be commit 29874f4b8fecdc7cbd84d656dafce54cca49e0b1)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 705cb485fd..26931ffd97 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -434,8 +434,12 @@
/*
* Define additional missing types
*/
-#ifndef HAVE_SIG_ATOMIC_T_TYPE
-typedef int sig_atomic_t;
+#if defined(HAVE_SIG_ATOMIC_T_TYPE) && defined(AIX)
+typedef sig_atomic_t SIG_ATOMIC_T;
+#elif defined(HAVE_SIG_ATOMIC_T_TYPE) && !defined(AIX)
+typedef sig_atomic_t VOLATILE SIG_ATOMIC_T;
+#else
+typedef int VOLATILE SIG_ATOMIC_T;
#endif
#ifndef HAVE_SOCKLEN_T_TYPE