diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-03 15:57:14 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-03 15:57:14 +0000 |
| commit | cd4e43a5af4dcf660969bc5abada0d97cfd0cd03 (patch) | |
| tree | 2cb7da25499aa1258196b6a2dc80346cfe40a2f1 /protocols/JabberG | |
| parent | 23617c95e41dc21347d4957c29fe5989a36e2a85 (diff) | |
version related code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@7478 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_api.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/version.h | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index 89bc5e6667..c666479159 100644 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -43,7 +43,7 @@ TCHAR szCoreVersion[100]; PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
- __VERSION_DWORD,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
__DESCRIPTION,
__AUTHOR,
__AUTHOREMAIL,
diff --git a/protocols/JabberG/src/jabber_api.cpp b/protocols/JabberG/src/jabber_api.cpp index 8eb0d5352b..41352082c2 100644 --- a/protocols/JabberG/src/jabber_api.cpp +++ b/protocols/JabberG/src/jabber_api.cpp @@ -46,7 +46,7 @@ int CJabberProto::GetVersion() const DWORD CJabberProto::GetJabberVersion() const
{
- return __VERSION_DWORD;
+ return PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM);
}
int CJabberProto::CompareJIDs(LPCTSTR jid1, LPCTSTR jid2)
diff --git a/protocols/JabberG/src/version.h b/protocols/JabberG/src/version.h index 428c71a6bf..4d6d34d675 100644 --- a/protocols/JabberG/src/version.h +++ b/protocols/JabberG/src/version.h @@ -1,7 +1,11 @@ -#define __FILEVERSION_STRING 0,11,0,4
-#define __VERSION_STRING "0.11.0.4"
-#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0,11,0,4)
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 11
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 4
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+#define __TOSTRING(x) #x
+#define __VERSION_STRING __TOSTRING(__FILEVERSION_STRING)
#define __PLUGIN_NAME "Jabber Protocol"
#define __DESCRIPTION "Jabber protocol support for Miranda NG."
|