From 659a361a09bcc4571966921f474e477860963723 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 19 Nov 2009 11:55:35 +0000
Subject: Solved compilation warnings in linux.

---
 tools/mhmake/src/Makefile.am          | 8 ++++----
 tools/mhmake/src/flexskel.cc          | 2 +-
 tools/mhmake/src/flexskel.h           | 2 +-
 tools/mhmake/src/mhmake.cpp           | 3 ++-
 tools/mhmake/src/mhmakefileparser.cpp | 2 +-
 tools/mhmake/src/mhmakefileparser.h   | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'tools/mhmake/src')

diff --git a/tools/mhmake/src/Makefile.am b/tools/mhmake/src/Makefile.am
index 9e84d0f1f..be46f3bd6 100644
--- a/tools/mhmake/src/Makefile.am
+++ b/tools/mhmake/src/Makefile.am
@@ -24,26 +24,26 @@ mhmakeparser.cpp: mhmakeparser.y
 mhmakeparser.h: mhmakeparser.y
 
 .l.cpp:
-	$(LEXCOMPILE) -S$(dir $<)flexskel.cc -H$(dir $<)flexskel.h -h$(@:%.cpp=%.h) -otemp1234.456 $<
+	$(LEXCOMPILE) -S$(srcdir)/flexskel.cc -H$(srcdir)/flexskel.h -h$(@:%.cpp=%.h) -otemp1234.456 $<
 	echo '#include "stdafx.h"' > $@
 	cat temp1234.456 >> $@
 	rm temp1234.456
 
 .y.cpp:
-	$(YACCCOMPILE) -S$(dir $<)bison.cc -H$(dir $<)bison.h -h$(@:%.cpp=%.h) -otemp1234.456 $<
+	$(YACCCOMPILE) -S$(srcdir)/bison.cc -H$(srcdir)/bison.h -h$(@:%.cpp=%.h) -otemp1234.456 $<
 	echo '#include "stdafx.h"' > $@
 	cat temp1234.456 >> $@
 	rm temp1234.456
 
 
 .l.h:
-	$(LEXCOMPILE) -S$(dir $<)flexskel.cc -H$(dir $<)flexskel.h -h$@ -otemp1234.456 $<
+	$(LEXCOMPILE) -S$(srcdir)/flexskel.cc -H$(srcdir)/flexskel.h -h$@ -otemp1234.456 $<
 	echo '#include "stdafx.h"' > $(@:%.h=%.cpp)
 	cat temp1234.456 >> $(@:%.h=%.cpp)
 	rm temp1234.456
 
 .y.h:
-	$(YACCCOMPILE) -S$(dir $<)bison.cc -H$(dir $<)bison.h -h$@ -otemp1234.456 $<
+	$(YACCCOMPILE) -S$(srcdir)/bison.cc -H$(srcdir)/bison.h -h$@ -otemp1234.456 $<
 	echo '#include "stdafx.h"' > $(@:%.h=%.cpp)
 	cat temp1234.456 >> $(@:%.h=%.cpp)
 	rm temp1234.456
diff --git a/tools/mhmake/src/flexskel.cc b/tools/mhmake/src/flexskel.cc
index 050031b36..148e7f54c 100644
--- a/tools/mhmake/src/flexskel.cc
+++ b/tools/mhmake/src/flexskel.cc
@@ -348,7 +348,7 @@ int  YY_@_CLASS::yy___input(char * buffer,int &result,int max_size)
 }
 #endif
 #ifndef YY_@_FATAL_ERROR_NOCODE
-void YY_@_CLASS::yy___fatal_error(char *msg)
+void YY_@_CLASS::yy___fatal_error(const char *msg)
 {
   YY_@_FATAL_ERROR_CODE
 }
diff --git a/tools/mhmake/src/flexskel.h b/tools/mhmake/src/flexskel.h
index 8e02a7b32..58d807f6a 100644
--- a/tools/mhmake/src/flexskel.h
+++ b/tools/mhmake/src/flexskel.h
@@ -361,7 +361,7 @@ protected:/* non virtual */
    =0
 #endif
   ;
-  virtual void  YY_@_FATAL_ERROR(char *msg)
+  virtual void  YY_@_FATAL_ERROR(const char *msg)
 #ifdef YY_@_FATAL_ERROR_PURE
   =0
 #endif
diff --git a/tools/mhmake/src/mhmake.cpp b/tools/mhmake/src/mhmake.cpp
index 69f69f241..77f7a8db6 100644
--- a/tools/mhmake/src/mhmake.cpp
+++ b/tools/mhmake/src/mhmake.cpp
@@ -75,7 +75,8 @@ int __CDECL main(int argc, char* argv[])
   {
     mhmakefileparser::InitBuildTime();
 
-    putenv("PLATFORM="PLATFORM);
+    char PlatformEnv[]="PLATFORM="PLATFORM;
+    putenv(PlatformEnv);
 
     vector<string> CmdLineArgs;
     for (int i=1; i<argc; i++)
diff --git a/tools/mhmake/src/mhmakefileparser.cpp b/tools/mhmake/src/mhmakefileparser.cpp
index 0ba67cc4e..cc1c308dd 100644
--- a/tools/mhmake/src/mhmakefileparser.cpp
+++ b/tools/mhmake/src/mhmakefileparser.cpp
@@ -34,7 +34,7 @@ int mhmakefileparser::yylex(void)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void mhmakefileparser::yyerror(char *m)
+void mhmakefileparser::yyerror(const char *m)
 {
   cerr << this->m_ptheLexer->m_InputFileName<< " ("<<m_yyloc<<"): "<<m<<endl;
 }
diff --git a/tools/mhmake/src/mhmakefileparser.h b/tools/mhmake/src/mhmakefileparser.h
index f95d68c01..1f321b019 100644
--- a/tools/mhmake/src/mhmakefileparser.h
+++ b/tools/mhmake/src/mhmakefileparser.h
@@ -172,7 +172,7 @@ public:
     SaveAutoDepsFile();
   }
   virtual int yylex(void);
-  virtual void yyerror(char *m);
+  virtual void yyerror(const char *m);
   virtual int yyparse()=0;
 
   int ParseFile(const refptr<fileinfo> &FileInfo,bool SetMakeDir=false);
-- 
cgit v1.2.3