StarMirror
/
toxcore
mirror of https://github.com/irungentoo/toxcore
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update the compatablity function to match the macro

pull/1527/head
Gregory Mullen (GrayHatter) 2016-02-13 20:44:30 -08:00
parent 2d361228cd
commit 96bf594be5
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toxav/toxav.c
View File

@ -121,10 +121,11 @@ uint32_t toxav_version_patch(void)
bool toxav_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
{
if (major != TOXAV_VERSION_MAJOR)
return 0;
else
return 1;
return (TOXAV_VERSION_MAJOR == major && /* Force the major version */
(TOXAV_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */
(TOXAV_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */
)
)
}
ToxAV *toxav_new(Tox *tox, TOXAV_ERR_NEW *error)

9
toxcore/tox.c
View File

@ -87,10 +87,11 @@ uint32_t tox_version_patch(void)
bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
{
if (major != TOX_VERSION_MAJOR)
return 0;
else
return 1;
return (TOX_VERSION_MAJOR == major && /* Force the major version */
(TOX_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */
(TOX_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */
)
)
}