From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 22 Aug 2023 14:50:00 +0000 (+0200)
Subject: Use the C++ header file generated by bison instead of opting for a C header file
X-Git-Tag: rec-5.0.0-alpha1~33^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13164%2Fhead;p=thirdparty%2Fpdns.git

Use the C++ header file generated by bison instead of opting for a C header file
---

diff --git a/modules/bindbackend/Makefile.am b/modules/bindbackend/Makefile.am
index 58663f50b9..7906e2078c 100644
--- 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 43a464f8ab..7b4436ef57 100644
--- 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
 
@@ -1676,11 +1676,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 85cc0c6ef0..65dfc4da02 100644
--- 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