X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2Fparser.ypp;fp=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2Fparser.ypp;h=eb6e32c7a94856c522a70c6e7e8ea6220deded64;hb=c802cacb9f0879a42e01575595a75bbefe7d3db9;hp=82dd8ccd3fa06921c4a16af77e934d65cfafa857;hpb=145eca9d9f8caf8c3c084ec82b43dc1ee52870d2;p=babeltrace.git

diff --git a/src/plugins/ctf/common/metadata/parser.ypp b/src/plugins/ctf/common/metadata/parser.ypp
index 82dd8ccd..eb6e32c7 100644
--- a/src/plugins/ctf/common/metadata/parser.ypp
+++ b/src/plugins/ctf/common/metadata/parser.ypp
@@ -7,25 +7,25 @@
  * Common Trace Format Metadata Grammar.
  */
 
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <glib.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #define BT_LOG_OUTPUT_LEVEL ctf_plugin_metadata_log_level
 #define BT_LOG_TAG "PLUGIN/CTF/META/PARSER"
 #include "plugins/ctf/common/metadata/logging.hpp"
 
-#include <stdio.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <glib.h>
-#include <errno.h>
-#include <inttypes.h>
 #include "common/list.h"
 #include "common/assert.h"
-#include "plugins/ctf/common/metadata/scanner.hpp"
+
 #include "plugins/ctf/common/metadata/ast.hpp"
 #include "plugins/ctf/common/metadata/objstack.hpp"
-
 #include "plugins/ctf/common/metadata/parser-wrap.hpp"
 
 /*
@@ -1048,6 +1048,8 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 #ifndef ALLOW_INCLUDE_PARSER_H
 # error "Don't include parser.h directly, include parser-wrap.h instead."
 #endif
+
+#include "plugins/ctf/common/metadata/scanner.hpp"
 }
 
 %code provides {