summaryrefslogtreecommitdiff
path: root/l10ntools/source/xrmmerge.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'l10ntools/source/xrmmerge.cxx')
-rw-r--r--l10ntools/source/xrmmerge.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index deeccf731039..f3705fa7b17f 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -26,6 +26,7 @@
#include "common.hxx"
#include "export.hxx"
#include "po.hxx"
+#include "xrmlex.hxx"
#include "xrmmerge.hxx"
#include "tokens.h"
#include "helper.hxx"
@@ -36,7 +37,6 @@
using namespace std;
void yyerror( const char * );
-void YYWarning( const char * );
// set of global variables
bool bMergeMode;
@@ -78,7 +78,7 @@ extern char *GetOutputFile( int argc, char* argv[])
}
}
-int InitXrmExport( char*, char* pFilename)
+int InitXrmExport( const char* pFilename)
{
// instanciate Export
OString sFilename( pFilename );