#ifdef out solaris specifics, fix possible solaris ambiguity

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

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index 716df7e1d454493ab04475436e79fcb870b3218b..206beccdb6753977ea68deff8ca37ada5ba712bb 100644 (file)
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -40,7 +40,7 @@ clean:
        -rm -f *.o *~ pdns_recursor rec_control optional/*.o
        
 dep:
-       $(CC) $(CXXFLAGS) -MM *.cc *.hh > $@
+       $(CXX) $(CXXFLAGS) -MM *.cc *.hh > $@
 
 -include dep
 

diff --git a/pdns/portsmplexer.cc b/pdns/portsmplexer.cc
index 34b1b7007a89795dba3444e571925398464f4f49..9daec8e46ad2aebf79c96117df0ee0ed63a189d1 100644 (file)
--- a/pdns/portsmplexer.cc
+++ b/pdns/portsmplexer.cc
@@ -5,8 +5,12 @@
 #include "misc.hh"
 #include <boost/lexical_cast.hpp>
 #include "syncres.hh"
+
+#if defined(__sun__) && defined(__svr4__)
 #include <port.h>
 #include <sys/port_impl.h>
+#endif
+
 using namespace boost;
 using namespace std;
 

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index 4028860ec6c422cbf071c539320642c0358caf47..f4efa3e430b0be816e7315be77a441ac2d8e6224 100644 (file)
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -44,7 +44,7 @@ string simpleCompress(const string& label)
     ret.append(1, (char)(i->second - i->first));
     ret.append(label.c_str() + i->first, i->second - i->first);
   }
-  ret.append(1,0);
+  ret.append(1,(char)0);
   return ret;
 }