Merge remote-tracking branch 'github/pr/1088' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)
src/liboconfig/oconfig.c
src/liboconfig/scanner.l

index 181eadd..56ccefb 100644 (file)
@@ -25,6 +25,7 @@
 #include "oconfig.h"
 
 extern FILE *yyin;
+extern int yyparse (void);
 
 oconfig_item_t *ci_root;
 const char     *c_file;
index 9f0cd8e..6294ae5 100644 (file)
  */
 
 %{
+/* lex and yacc do some weird stuff, so turn off some warnings. */
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wunused-function"
+# pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
+#endif
+
 #include <stdlib.h>
 #include "oconfig.h"
 #include "aux_types.h"