From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 15 Oct 2013 14:10:07 +0000 (+0200)
Subject: don't rely on included polarssl header files when using system polarssl. Spotted... 
X-Git-Tag: rec-3.6.0-rc1~404
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90839871d7a9cecd3259552eca8fe7e5ee37872d;p=thirdparty%2Fpdns.git

don't rely on included polarssl header files when using system polarssl. Spotted by Oden Eriksson of Mandriva, thanks!
---

diff --git a/pdns/sha.hh b/pdns/sha.hh
index 3d5b47b531..055d6f7455 100644
--- a/pdns/sha.hh
+++ b/pdns/sha.hh
@@ -3,15 +3,9 @@
 
 #include <string>
 #include <stdint.h>
-#ifdef HAVE_LIBPOLARSSLSSL
 #include <polarssl/sha1.h>
 #include <polarssl/sha2.h>
 #include <polarssl/sha4.h>
-#else
-#include "ext/polarssl-1.1.2/include/polarssl/sha1.h"
-#include "ext/polarssl-1.1.2/include/polarssl/sha2.h"
-#include "ext/polarssl-1.1.2/include/polarssl/sha4.h"
-#endif
 
 class SHA1Summer
 {