From cd4e43a5af4dcf660969bc5abada0d97cfd0cd03 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 3 Jan 2014 15:57:14 +0000 Subject: version related code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@7478 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CryptoPP/src/cpp_misc.cpp | 2 +- plugins/CryptoPP/src/version.h | 29 ++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) (limited to 'plugins/CryptoPP/src') diff --git a/plugins/CryptoPP/src/cpp_misc.cpp b/plugins/CryptoPP/src/cpp_misc.cpp index 77de159fcb..ec7a0ae043 100644 --- a/plugins/CryptoPP/src/cpp_misc.cpp +++ b/plugins/CryptoPP/src/cpp_misc.cpp @@ -14,7 +14,7 @@ int __cdecl cpp_get_error(HANDLE context) { int __cdecl cpp_get_version(void) { - return __VERSION_DWORD; + return PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM); } diff --git a/plugins/CryptoPP/src/version.h b/plugins/CryptoPP/src/version.h index 5b2341dd2e..82dcf64589 100644 --- a/plugins/CryptoPP/src/version.h +++ b/plugins/CryptoPP/src/version.h @@ -1,17 +1,16 @@ -#define __MAJOR_VERSION 1 -#define __MINOR_VERSION 0 -#define __RELEASE_NUM 4 -#define __BUILD_NUM 7 +#define __MAJOR_VERSION 1 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 4 +#define __BUILD_NUM 7 -#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __TOSTRING(x) #x -#define __VERSION_STRING __TOSTRING(__FILEVERSION_STRING) -#define __VERSION_DWORD ((__MAJOR_VERSION<<24) | (__MINOR_VERSION<<16) | (__RELEASE_NUM<<8) | __BUILD_NUM) +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM +#define __TOSTRING(x) #x +#define __VERSION_STRING __TOSTRING(__FILEVERSION_STRING) -#define __PLUGIN_NAME "Crypto++" -#define __FILENAME "CryptoPP.dll" -#define __DESCRIPTION "Crypto++ library for SecureIM plugin." -#define __AUTHOR "Baloo" -#define __AUTHOREMAIL "baloo@bk.ru" -#define __AUTHORWEB "http://miranda-ng.org/p/CryptoPP/" -#define __COPYRIGHT "© 2006-09 Baloo" +#define __PLUGIN_NAME "Crypto++" +#define __FILENAME "CryptoPP.dll" +#define __DESCRIPTION "Crypto++ library for SecureIM plugin." +#define __AUTHOR "Baloo" +#define __AUTHOREMAIL "baloo@bk.ru" +#define __AUTHORWEB "http://miranda-ng.org/p/CryptoPP/" +#define __COPYRIGHT "© 2006-09 Baloo" -- cgit v1.2.3