From d4f647c859139a56b403e864ebb4ed08f40e35be Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 14 Oct 2008 03:17:52 +0200
Subject: Remove define for VOLATILE, volatile is already provided by
 libreplace.

---
 source3/include/includes.h          | 14 ++------------
 source3/nsswitch/winbind_nss_irix.c |  1 -
 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
@@ -285,25 +285,15 @@ typedef int ber_int_t;
 #define HAVE_ADS
 #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
-- 
cgit