From: Kees Monshouwer <mind04@monshouwer.org>
Date: Thu, 24 Oct 2013 20:02:53 +0000 (+0200)
Subject: remove windows code from parser
X-Git-Tag: rec-3.6.0-rc1~382^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1081%2Fhead;p=thirdparty%2Fpdns.git

remove windows code from parser
---

diff --git a/pdns/backends/bind/bindlexer.l b/pdns/backends/bind/bindlexer.l
index 1ecb394ee1..2f783eade9 100644
--- a/pdns/backends/bind/bindlexer.l
+++ b/pdns/backends/bind/bindlexer.l
@@ -7,22 +7,7 @@
 #define YY_NO_INPUT 1
 #define YYSTYPE char *
 
-#ifdef WIN32
-#include "bindparser.tab.hh"
-
-extern "C"
-{
-  int isatty( int );
-  int yywrap()
-  {
-    return 1;
-  }
-}
-
-
-#else
 #include "bindparser.h"
-#endif // WIN32
 
 int linenumber;
 #define MAX_INCLUDE_DEPTH 10
diff --git a/pdns/backends/bind/bindparser.yy b/pdns/backends/bind/bindparser.yy
index 0fd148e595..5e2ff5dfc8 100644
--- a/pdns/backends/bind/bindparser.yy
+++ b/pdns/backends/bind/bindparser.yy
@@ -16,11 +16,8 @@ extern int yydebug;
 
 #define YYSTYPE char *
 
-
-#ifndef WIN32
 extern "C" 
 {
-#endif // WIN32
 	int yyparse(void);
 	int yylex(void);
 	void yyrestart(FILE *);
@@ -28,9 +25,7 @@ extern "C"
 	{
 		return 1;
 	}
-#ifndef WIN32
 }
-#endif // WIN32
 
 
 extern int yydebug;