Merge pull request #13164 from fredmorcos/bindlexer-use-c++-header

Bindlexer use C++ bison header

diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am
index 58663f50b900dbcf06ceeebffba60f236a4945bb..7906e2078cb90d8c163975cd67eee3a94725083e 100644 (file)
--- a/modules/bindbackend/Makefile.am
+++ b/modules/bindbackend/Makefile.am
@@ -19,7 +19,3 @@ libbindbackend_la_SOURCES = \
        binddnssec.cc
 
 libbindbackend_la_LDFLAGS = -module -avoid-version
-
-# for bindparser.h/hh
-.hh.h:
-       cp $< $@

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 6f575dbe46b00fd1c8ce3049d776872915ab175f..eab26ffb3013484bc4213ece622f088809218042 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_DIST = \
        dnsmessage.proto \
        mtasker.cc \
        inflighter.cc \
-       bindparser.h \
+       bindparser.hh \
        named.conf.parsertest \
        pdns.service.in \
        ixfrdist.service.in \
@@ -71,7 +71,7 @@ EXTRA_DIST = \
 
 BUILT_SOURCES = \
        bind-dnssec.schema.sqlite3.sql.h \
-       bindparser.h \
+       bindparser.hh \
        dnslabeltext.cc \
        apidocfiles.h
 
@@ -1681,11 +1681,7 @@ dnslabeltext.cc: dnslabeltext.rl
 bind-dnssec.schema.sqlite3.sql.h: bind-dnssec.schema.sqlite3.sql
        ( echo '#pragma once'; echo 'static char sqlCreate[] __attribute__((unused))=' ; sed 's/$$/"/g' $< | sed 's/^/"/g'  ; echo ';' ) > $@
 
-# for bindparser.h/hh
-.hh.h:
-       cp $< $@
-
-bindlexer.$(OBJEXT): bindparser.h
+bindlexer.$(OBJEXT): bindparser.hh
 
 pdns_recursor rec_control:
        @echo "Please build the recursor from the recursordist/ dir"

diff --git a/pdns/bindlexer.l b/pdns/bindlexer.l
index 8a5f380d3ba6bfb185ab779672772fae66931d46..65dfc4da02ca94d5f86d15c09916ee16f09f2fed 100644 (file)
--- a/pdns/bindlexer.l
+++ b/pdns/bindlexer.l
@@ -7,7 +7,7 @@
 #define YY_NO_INPUT 1
 #define YYSTYPE char *
 
-#include "bindparser.h"
+#include "bindparser.hh"
 
 int linenumber;
 #define MAX_INCLUDE_DEPTH 10
@@ -21,7 +21,7 @@ extern const char *bind_directory;
 
 %}
 
-%x comment 
+%x comment
 %x incl
 %x quoted
 %option stack
@@ -106,7 +106,7 @@ include                 BEGIN(incl);
 
 
 
-zone                   return ZONETOK; 
+zone                   return ZONETOK;
 
 file                   return FILETOK;
 options                 return OPTIONSTOK;