summaryrefslogtreecommitdiff
path: root/toxcore/tox.c
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2016-08-09 13:46:41 +0100
committeriphydf <iphydf@users.noreply.github.com>2016-08-12 01:00:00 +0100
commit459f8f201393ac458445aebbd14c45bf4d6f5912 (patch)
tree67c7eb3c6338f701cdbd3fae808b45fa126fcd74 /toxcore/tox.c
parent8339e3449f41f5d6edd16a8657f7faa84040fdc3 (diff)
Check code formatting on Travis.
We run astyle on Travis and check if there is a diff. The build terminates if git finds a difference.
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r--toxcore/tox.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 23d0d3e4..b642db75 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -87,11 +87,11 @@ uint32_t tox_version_patch(void)
87 87
88bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch) 88bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch)
89{ 89{
90 return (TOX_VERSION_MAJOR == major && /* Force the major version */ 90 return (TOX_VERSION_MAJOR == major && /* Force the major version */
91 (TOX_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */ 91 (TOX_VERSION_MINOR > minor || /* Current minor version must be newer than requested -- or -- */
92 (TOX_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */ 92 (TOX_VERSION_MINOR == minor && TOX_VERSION_PATCH >= patch) /* the patch must be the same or newer */
93 ) 93 )
94 ); 94 );
95} 95}
96 96
97 97