[OMPT-svn-commit] SF.net SVN: modplug:[5101] trunk/OpenMPT

[<man...@us...>]

Revision: 5101
          http://sourceforge.net/p/modplug/code/5101
Author:   manxorist
Date:     2015-05-15 07:34:44 +0000 (Fri, 15 May 2015)
Log Message:
-----------
[Ref] build: Make svn_version.h usable in C code.

Modified Paths:
--------------
    trunk/OpenMPT/build/svn_version/svn_version.h
    trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h
    trunk/OpenMPT/common/version.cpp

Modified: trunk/OpenMPT/build/svn_version/svn_version.h
===================================================================
--- trunk/OpenMPT/build/svn_version/svn_version.h	2015-05-15 07:18:57 UTC (rev 5100)
+++ trunk/OpenMPT/build/svn_version/svn_version.h	2015-05-15 07:34:44 UTC (rev 5101)
@@ -2,9 +2,9 @@
 #pragma once
 
 #if defined(MPT_PACKAGE)
-#define OPENMPT_VERSION_IS_PACKAGE true
+#define OPENMPT_VERSION_IS_PACKAGE 1
 #else
-#define OPENMPT_VERSION_IS_PACKAGE false
+#define OPENMPT_VERSION_IS_PACKAGE 0
 #endif
 
 #if defined(MPT_SVNVERSION)

Modified: trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h
===================================================================
--- trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h	2015-05-15 07:18:57 UTC (rev 5100)
+++ trunk/OpenMPT/build/svn_version/svn_version.template.subwcrev.h	2015-05-15 07:34:44 UTC (rev 5101)
@@ -4,9 +4,9 @@
 #define OPENMPT_VERSION_URL "$WCURL$"
 #define OPENMPT_VERSION_REVISION $WCREV$
 
-#define OPENMPT_VERSION_DIRTY $WCMODS?true:false$
-#define OPENMPT_VERSION_MIXEDREVISIONS $WCMIXED?true:false$
+#define OPENMPT_VERSION_DIRTY $WCMODS?1:0$
+#define OPENMPT_VERSION_MIXEDREVISIONS $WCMIXED?1:0$
 
-#define OPENMPT_VERSION_IS_PACKAGE false
+#define OPENMPT_VERSION_IS_PACKAGE 0
 
 #define OPENMPT_VERSION_DATE "$WCNOW=%Y-%m-%d %H:%M:%S$"

Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp	2015-05-15 07:18:57 UTC (rev 5100)
+++ trunk/OpenMPT/common/version.cpp	2015-05-15 07:34:44 UTC (rev 5101)
@@ -166,7 +166,7 @@
 bool IsDirty()
 {
 	#if defined(OPENMPT_VERSION_DIRTY)
-		return OPENMPT_VERSION_DIRTY;
+		return OPENMPT_VERSION_DIRTY ? true : false;
 	#elif defined(OPENMPT_VERSION_SVNVERSION)
 		std::string svnversion = OPENMPT_VERSION_SVNVERSION;
 		if(svnversion.length() == 0)
@@ -186,7 +186,7 @@
 bool HasMixedRevisions()
 {
 	#if defined(OPENMPT_VERSION_MIXEDREVISIONS)
-		return OPENMPT_VERSION_MIXEDREVISIONS;
+		return OPENMPT_VERSION_MIXEDREVISIONS ? true : false;
 	#elif defined(OPENMPT_VERSION_SVNVERSION)
 		std::string svnversion = OPENMPT_VERSION_SVNVERSION;
 		if(svnversion.length() == 0)
@@ -218,7 +218,7 @@
 bool IsPackage()
 {
 	#if defined(OPENMPT_VERSION_IS_PACKAGE)
-		return OPENMPT_VERSION_IS_PACKAGE;
+		return OPENMPT_VERSION_IS_PACKAGE ? true : false;
 	#else
 		return false;
 	#endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.