diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 03:17:52 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-14 03:17:52 +0200 |
| commit | d4f647c859139a56b403e864ebb4ed08f40e35be (patch) | |
| tree | 982023d475760ed7769ae5540445702160006145 | |
| parent | efdc50344025d1081fbe35b2fab2d8948b0f36cb (diff) | |
| download | samba-d4f647c859139a56b403e864ebb4ed08f40e35be.tar.gz samba-d4f647c859139a56b403e864ebb4ed08f40e35be.tar.bz2 samba-d4f647c859139a56b403e864ebb4ed08f40e35be.zip | |
Remove define for VOLATILE, volatile is already provided by libreplace.
| -rw-r--r-- | source3/include/includes.h | 14 | ||||
| -rw-r--r-- | source3/nsswitch/winbind_nss_irix.c | 1 | ||||
| -rw-r--r-- | source3/nsswitch/wins.c | 1 |
3 files changed, 2 insertions, 14 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index bcd5fd3b48..a13372665c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -286,24 +286,14 @@ typedef int ber_int_t; #endif /* - * Define VOLATILE if needed. - */ - -#if defined(HAVE_VOLATILE) -#define VOLATILE volatile -#else -#define VOLATILE -#endif - -/* * Define additional missing types */ #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; +typedef sig_atomic_t volatile SIG_ATOMIC_T; #else -typedef int VOLATILE SIG_ATOMIC_T; +typedef int volatile SIG_ATOMIC_T; #endif #ifndef uchar diff --git a/source3/nsswitch/winbind_nss_irix.c b/source3/nsswitch/winbind_nss_irix.c index 4726c1e13f..5bc0fa54da 100644 --- a/source3/nsswitch/winbind_nss_irix.c +++ b/source3/nsswitch/winbind_nss_irix.c @@ -32,7 +32,6 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #endif #ifdef HAVE_NS_API_H -#undef VOLATILE #undef STATIC #undef DYNAMIC #include <ns_daemon.h> diff --git a/source3/nsswitch/wins.c b/source3/nsswitch/wins.c index 7d42381986..2f82997aaf 100644 --- a/source3/nsswitch/wins.c +++ b/source3/nsswitch/wins.c @@ -20,7 +20,6 @@ #include "includes.h" #ifdef HAVE_NS_API_H -#undef VOLATILE #include <ns_daemon.h> #endif |