From 653a5d5db88b0a6f27ba2addc89a89bdde17aec4 Mon Sep 17 00:00:00 2001 From: Bert Hubert Date: Thu, 11 Feb 2010 10:21:08 +0000 Subject: [PATCH] fix up solaris 10 compilation git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1522 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- pdns/portsmplexer.cc | 12 ++++++------ pdns/rcpgenerator.cc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pdns/portsmplexer.cc b/pdns/portsmplexer.cc index bcb7c6d3a..f79260ac2 100644 --- a/pdns/portsmplexer.cc +++ b/pdns/portsmplexer.cc @@ -1,16 +1,16 @@ +#if defined(__sun__) && defined(__svr4__) +#include +#include +#endif +#include #include "mplexer.hh" #include "sstuff.hh" #include -#include + #include "misc.hh" #include #include "syncres.hh" -#if defined(__sun__) && defined(__svr4__) -#include -#include -#endif - #include "namespaces.hh" using namespace std; diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc index 5988e05c9..26e261b02 100644 --- a/pdns/rcpgenerator.cc +++ b/pdns/rcpgenerator.cc @@ -77,7 +77,7 @@ void RecordTextReader::xfrTime(uint32_t &val) tm.tm_year-=1900; tm.tm_mon-=1; - val=(uint32_t)timegm(&tm); +// val=(uint32_t)timegm(&tm); XXX FIXME disabled for Solaris } void RecordTextReader::xfrIP(uint32_t &val) -- 2.50.0