From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:48:17 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kexi/kexidb/parser/parser_p.cpp | 2 +- kexi/kexidb/parser/sqlparser.cpp | 2 +- kexi/kexidb/parser/sqlparser.y | 2 +- kexi/kexidb/parser/sqlscanner.cpp | 2 +- kexi/kexidb/parser/sqlscanner.l | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kexi/kexidb/parser') diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index 1d2e5295..df4f3323 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -21,7 +21,7 @@ #include "sqlparser.h" #include -#include +#include #include diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index 097deb3b..b7ddccd8 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -800,7 +800,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y index c2d8e887..a3397806 100644 --- a/kexi/kexidb/parser/sqlparser.y +++ b/kexi/kexidb/parser/sqlparser.y @@ -466,7 +466,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp index 75ee2535..3cd6bdf3 100644 --- a/kexi/kexidb/parser/sqlscanner.cpp +++ b/kexi/kexidb/parser/sqlscanner.cpp @@ -507,7 +507,7 @@ char *yytext; #include "sqltypes.h" #include #include -#include +#include #define YY_NO_UNPUT #define ECOUNT current += yyleng; ctoken = yytext diff --git a/kexi/kexidb/parser/sqlscanner.l b/kexi/kexidb/parser/sqlscanner.l index 5f74a0ca..b16a615d 100644 --- a/kexi/kexidb/parser/sqlscanner.l +++ b/kexi/kexidb/parser/sqlscanner.l @@ -26,7 +26,7 @@ #include "sqltypes.h" #include #include -#include +#include #define YY_NO_UNPUT #define ECOUNT current += yyleng; ctoken = yytext -- cgit v1.2.1