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 9e0fd84f3fc1b84de8cb48d331696105cc635169..f9d71c1283008cd751d8825069f4531d9aeff829 100644 (file)
--- 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 31b956476238aa32b77eb7482c478216b4928e38..d7836bc88348dabdf9eef0fd8cf6f27ec4ccfcaa 100644 (file)
--- 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 4f73a9845cc30b23afefa0dcc86a23d3d57a9ef3..b3a9247a6ec14cd9cac71fd62abce13502cb7585 100644 (file)
--- 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 04c76167a61f90c588b615ceaa85afa490e271da..8287315f406740c5dedb1b05a894eee558def30c 100644 (file)
--- 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);