Fix a few warnings which show up with -Wundef

Also remove DARWIN, since OS X doesn't define that

diff --git a/pdns/dns.hh b/pdns/dns.hh
index 711ef1c219914893003f5297c7c120f8841d827c..63f65c7f9971d46f9720639661f7f78753ee1029 100644 (file)
--- a/pdns/dns.hh
+++ b/pdns/dns.hh
@@ -144,7 +144,7 @@ struct EDNS0Record
         uint16_t Z; 
 } GCCPACKATTRIBUTE;
 
-#if __FreeBSD__ || __APPLE__ || __OpenBSD__ || __DragonFly__ || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 #include <machine/endian.h>
 #elif __linux__ || __GNU__
 # include <endian.h>

diff --git a/pdns/unix_semaphore.cc b/pdns/unix_semaphore.cc
index 50a350ebd8ba7934e0af5822a5fd18737f89c13c..7064bc98dc3963d952533aabc2290dc85a35e3ae 100644 (file)
--- a/pdns/unix_semaphore.cc
+++ b/pdns/unix_semaphore.cc
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 
 
-#if DARWIN || _AIX || __APPLE__ 
+#if defined(_AIX) || defined(__APPLE__)
 
 // Darwin 6.0 Compatible implementation, uses pthreads so it portable across more platforms.
 

diff --git a/pdns/utility.hh b/pdns/utility.hh
index 870ee2f3d36387210bf058ad1d0abf9a78bab7fa..6280279c8bf84c2a2feb44386e8410fee2d7e124 100644 (file)
--- a/pdns/utility.hh
+++ b/pdns/utility.hh
@@ -52,7 +52,7 @@ class Semaphore
 private:
   typedef int sem_value_t;
 
-#if DARWIN || _AIX || __APPLE__
+#if defined(_AIX) || defined(__APPLE__)
   uint32_t       m_magic;
   pthread_mutex_t m_lock;
   pthread_cond_t  m_gtzero;