diff options
| author | iphydf <iphydf@users.noreply.github.com> | 2018-02-23 02:22:38 +0000 |
|---|---|---|
| committer | iphydf <iphydf@users.noreply.github.com> | 2018-02-24 22:20:22 +0000 |
| commit | d3b286cb434ed228e7b62cc70cb293e7a5554bfa (patch) | |
| tree | 9ab3dd66f9dba2ca861ba8c6e098fb96754aa80b /toxcore/tox.h | |
| parent | afc80922e720f5d2a93bdfb3745da058e5ddf81b (diff) | |
Fix a bunch of compiler warnings and remove suppressions.
Diffstat (limited to 'toxcore/tox.h')
| -rw-r--r-- | toxcore/tox.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/toxcore/tox.h b/toxcore/tox.h index f2e746c8..cf5b2c28 100644 --- a/toxcore/tox.h +++ b/toxcore/tox.h | |||
| @@ -191,19 +191,19 @@ uint32_t tox_version_patch(void); | |||
| 191 | * features, but can't break the API. | 191 | * features, but can't break the API. |
| 192 | */ | 192 | */ |
| 193 | #define TOX_VERSION_IS_API_COMPATIBLE(MAJOR, MINOR, PATCH) \ | 193 | #define TOX_VERSION_IS_API_COMPATIBLE(MAJOR, MINOR, PATCH) \ |
| 194 | (TOX_VERSION_MAJOR > 0 && TOX_VERSION_MAJOR == MAJOR) && ( \ | 194 | ((TOX_VERSION_MAJOR > 0 && TOX_VERSION_MAJOR == MAJOR) && ( \ |
| 195 | /* 1.x.x, 2.x.x, etc. with matching major version. */ \ | 195 | /* 1.x.x, 2.x.x, etc. with matching major version. */ \ |
| 196 | TOX_VERSION_MINOR > MINOR || \ | 196 | TOX_VERSION_MINOR > MINOR || \ |
| 197 | TOX_VERSION_MINOR == MINOR && TOX_VERSION_PATCH >= PATCH \ | 197 | (TOX_VERSION_MINOR == MINOR && TOX_VERSION_PATCH >= PATCH) \ |
| 198 | ) || (TOX_VERSION_MAJOR == 0 && MAJOR == 0) && ( \ | 198 | )) || ((TOX_VERSION_MAJOR == 0 && MAJOR == 0) && ( \ |
| 199 | /* 0.x.x makes minor behave like major above. */ \ | 199 | /* 0.x.x makes minor behave like major above. */ \ |
| 200 | (TOX_VERSION_MINOR > 0 && TOX_VERSION_MINOR == MINOR) && ( \ | 200 | ((TOX_VERSION_MINOR > 0 && TOX_VERSION_MINOR == MINOR) && ( \ |
| 201 | TOX_VERSION_PATCH >= PATCH \ | 201 | TOX_VERSION_PATCH >= PATCH \ |
| 202 | ) || (TOX_VERSION_MINOR == 0 && MINOR == 0) && ( \ | 202 | )) || ((TOX_VERSION_MINOR == 0 && MINOR == 0) && ( \ |
| 203 | /* 0.0.x and 0.0.y are only compatible if x == y. */ \ | 203 | /* 0.0.x and 0.0.y are only compatible if x == y. */ \ |
| 204 | TOX_VERSION_PATCH == PATCH \ | 204 | TOX_VERSION_PATCH == PATCH \ |
| 205 | ) \ | 205 | )) \ |
| 206 | ) | 206 | )) |
| 207 | 207 | ||
| 208 | /** | 208 | /** |
| 209 | * Return whether the compiled library version is compatible with the passed | 209 | * Return whether the compiled library version is compatible with the passed |