Use cpversion.h instead of version.h to reduce name clashing in headers

Signed-off-by: Ian bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian bell
2014-05-17 19:54:28 +02:00
parent d23e9447fa
commit eeab8e18fe
2 changed files with 6 additions and 6 deletions

View File

@@ -38,7 +38,7 @@ int get_debug_level(void){return debug_level;}
//// This is very hacky, but pull the git revision from the file
#include "gitrevision.h" // Contents are like "std::string gitrevision = "aa121435436ggregrea4t43t433";"
#include "version.h" // Contents are like "char version [] = "2.5";"
#include "cpversion.h" // Contents are like "char version [] = "2.5";"
//int global_Phase = -1;