Changeset 1440

Timestamp:

10/24/09 12:40:48 (5 months ago)

Author:

ahu

Message:

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

Location:

trunk/pdns/pdns

Files:

• base64.cc (modified) (1 diff)
• htimer.hh (modified) (1 diff)
• lock.hh (modified) (2 diffs)
• rcpgenerator.hh (modified) (2 diffs)
• rec_channel.hh (modified) (1 diff)

trunk/pdns/pdns/base64.cc

@@ -1 +1 @@
 #include "base64.hh"
-
+#include <inttypes.h>
 
 namespace anonpdns {

trunk/pdns/pdns/htimer.hh

@@ -1 +1 @@
 #ifndef PDNS_HTIMER_HH
 #define PDNS_HTIMER_HH
-
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>

trunk/pdns/pdns/lock.hh

@@ -79 +79 @@
   TryWriteLock(pthread_rwlock_t *lock) : d_lock(lock)
   {
-    if(g_singleThreaded)
+    if(g_singleThreaded) {
+      d_havelock=true;
       return;
+    }
 
     d_havelock=false;
@@ -112 +114 @@
   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());

trunk/pdns/pdns/rcpgenerator.hh

@@ -1 +1 @@
 /*
     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
@@ -20 +20 @@
 #ifndef PDNS_RCPGENERATOR_HH
 #define PDNS_RCPGENERATOR_HH
-
+#include <inttypes.h>
 #include <string>
 #include <stdexcept>

trunk/pdns/pdns/rec_channel.hh

@@ -3 +3 @@
 #include <string>
 #include <map>
+#include <inttypes.h>
 #if !defined SOLARIS8 && !defined WIN32