From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 9 Mar 2019 18:21:09 +0000 (+0000)
Subject: libpakfire: Fix header declarations in parser.h
X-Git-Tag: 0.9.28~1285^2~1105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35ebb186c5454b0808c83a2d6cfea6811f714709;p=pakfire.git

libpakfire: Fix header declarations in parser.h

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 9e0fd84f3..f9d71c128 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -256,6 +256,11 @@ libpakfire_parser_la_SOURCES = \
 libpakfire_parser_la_CFLAGS = \
 	$(AM_CFLAGS)
 
+libpakfire_parser_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src/libpakfire/include \
+	-include $(top_builddir)/config.h
+
 src/libpakfire/parser/scanner.c: src/libpakfire/parser/grammar.h
 
 lib_LTLIBRARIES += \
diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 31b956476..d7836bc88 100644
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -41,6 +41,7 @@
 #include <pakfire/key.h>
 #include <pakfire/logging.h>
 #include <pakfire/pakfire.h>
+#include <pakfire/parser.h>
 #include <pakfire/private.h>
 #include <pakfire/util.h>
 
@@ -358,7 +359,7 @@ static int pakfire_archive_parse_entry_metadata(PakfireArchive archive,
 	}
 
 	// Parse metadata file
-	r = pakfire_parser_parse_metadata(archive->pakfire, data, data_size);
+	r = pakfire_parser_parse_metadata(archive->pakfire, (const char*)data, data_size);
 
 	pakfire_free(data);
 
diff --git a/src/libpakfire/include/pakfire/parser.h b/src/libpakfire/include/pakfire/parser.h
index 4f73a9845..b3a9247a6 100644
--- a/src/libpakfire/include/pakfire/parser.h
+++ b/src/libpakfire/include/pakfire/parser.h
@@ -23,7 +23,9 @@
 
 #ifdef PAKFIRE_PRIVATE
 
-int pakfire_parser_parse_metadata(const char* data, size_t len);
+#include <pakfire/types.h>
+
+int pakfire_parser_parse_metadata(Pakfire pakfire, const char* data, size_t len);
 
 #endif /* PAKFIRE_PRIVATE */
 
diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y
index 04c76167a..8287315f4 100644
--- a/src/libpakfire/parser/grammar.y
+++ b/src/libpakfire/parser/grammar.y
@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <pakfire/types.h>
+
 #define YYERROR_VERBOSE 1
 
 typedef struct yy_buffer_state* YY_BUFFER_STATE;
@@ -49,7 +51,7 @@ top: NEWLINE
 
 %%
 
-int pakfire_parser_parse_metadata(const char* data, size_t len) {
+int pakfire_parser_parse_metadata(Pakfire pakfire, const char* data, size_t len) {
 	YY_BUFFER_STATE buffer = yy_scan_bytes(data, len);
 	int r = yyparse();
 	yy_delete_buffer(buffer);