From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sat, 24 Oct 2009 10:40:48 +0000 (+0000)
Subject: compilation fixes for on 'Karmic Koala' - also first commit from the new server ... 
X-Git-Tag: rec-3.2~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b808f13b9506e79111331a0d8906eb3f34a1e92;p=pdns

compilation fixes for on 'Karmic Koala' - also first commit from the new server @ xs4all!


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1440 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/base64.cc b/pdns/base64.cc
index 6b8a97f66..92c61dd94 100644
--- a/pdns/base64.cc
+++ b/pdns/base64.cc
@@ -1,5 +1,5 @@
 #include "base64.hh"
-
+#include <inttypes.h>
 
 namespace anonpdns {
 char B64Decode1(char cInChar)
diff --git a/pdns/htimer.hh b/pdns/htimer.hh
index fd6c53540..e45395e09 100644
--- a/pdns/htimer.hh
+++ b/pdns/htimer.hh
@@ -1,6 +1,6 @@
 #ifndef PDNS_HTIMER_HH
 #define PDNS_HTIMER_HH
-
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include <map>
diff --git a/pdns/lock.hh b/pdns/lock.hh
index 59e262b15..b98b69e7f 100644
--- a/pdns/lock.hh
+++ b/pdns/lock.hh
@@ -78,8 +78,10 @@ public:
 
   TryWriteLock(pthread_rwlock_t *lock) : d_lock(lock)
   {
-    if(g_singleThreaded)
+    if(g_singleThreaded) {
+      d_havelock=true;
       return;
+    }
 
     d_havelock=false;
     if((errno=pthread_rwlock_trywrlock(d_lock)) && errno!=EBUSY)
@@ -111,10 +113,11 @@ public:
 
   TryReadLock(pthread_rwlock_t *lock) : d_lock(lock)
   {
-    if(g_singleThreaded)
+    if(g_singleThreaded) {
+      d_havelock=true;
       return;
+    }
 
-    d_havelock=false;
     if((errno=pthread_rwlock_tryrdlock(d_lock)) && errno!=EBUSY)
       throw AhuException("error acquiring rwlock tryrdlock: "+stringerror());
     d_havelock=(errno==0);
diff --git a/pdns/rcpgenerator.hh b/pdns/rcpgenerator.hh
index 32d3efcf6..403e9c858 100644
--- a/pdns/rcpgenerator.hh
+++ b/pdns/rcpgenerator.hh
@@ -1,6 +1,6 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2005  PowerDNS.COM BV
+    Copyright (C) 2005 - 2009  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2 as 
@@ -19,7 +19,7 @@
 
 #ifndef PDNS_RCPGENERATOR_HH
 #define PDNS_RCPGENERATOR_HH
-
+#include <inttypes.h>
 #include <string>
 #include <stdexcept>
 #if !defined SOLARIS8 && !defined WIN32
diff --git a/pdns/rec_channel.hh b/pdns/rec_channel.hh
index e2f3b03a9..697a119d8 100644
--- a/pdns/rec_channel.hh
+++ b/pdns/rec_channel.hh
@@ -2,6 +2,7 @@
 #define PDNS_REC_CHANNEL
 #include <string>
 #include <map>
+#include <inttypes.h>
 #if !defined SOLARIS8 && !defined WIN32
 
 #elif defined WIN32