diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-11 19:58:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-11 19:58:13 -0400 |
| commit | 60997a00e8e7585e076c750ab37095c0bfc3c773 (patch) | |
| tree | aacbce58d16df12c6fa42218bf17b719fcd0896f | |
| parent | d5c47f043665d4513bad10e3220dc9b5f088c543 (diff) | |
| download | tor-60997a00e8e7585e076c750ab37095c0bfc3c773.tar.gz tor-60997a00e8e7585e076c750ab37095c0bfc3c773.zip | |
Fix a bug in the old-gcc version of ENABLE_GCC_WARNING
Fixes bug 19901; bugfix on 0.2.9.1-alpha.
| -rw-r--r-- | changes/bug19901 | 5 | ||||
| -rw-r--r-- | src/common/compat.h | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/changes/bug19901 b/changes/bug19901 new file mode 100644 index 0000000000..97bca0635f --- /dev/null +++ b/changes/bug19901 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): +v - Fix a compilation warning on GCC versions before 4.6. Our + ENABLE_GCC_WARNING macro used the word "warning" as an + argument, when it is also required as an argument to the + compiler pragma. Fixes bug 19901; bugfix on 0.2.9.1-alpha. diff --git a/src/common/compat.h b/src/common/compat.h index 54ab8b08e8..40bcb26df7 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -104,17 +104,17 @@ # endif # if defined(__clang__) || GCC_VERSION >= 406 /* we have push/pop support */ -# define DISABLE_GCC_WARNING(warning) \ +# define DISABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(push) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warning)) -# define ENABLE_GCC_WARNING(warning) \ + PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) +# define ENABLE_GCC_WARNING(warningopt) \ PRAGMA_DIAGNOSTIC_(pop) # else /* older version of gcc: no push/pop support. */ -# define DISABLE_GCC_WARNING(warning) \ - PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warning)) -# define ENABLE_GCC_WARNING(warning) \ - PRAGMA_DIAGNOSTIC_(warning PRAGMA_JOIN_STRINGIFY_(-W,warning)) +# define DISABLE_GCC_WARNING(warningopt) \ + PRAGMA_DIAGNOSTIC_(ignored PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) +# define ENABLE_GCC_WARNING(warningopt) \ + PRAGMA_DIAGNOSTIC_(warning PRAGMA_JOIN_STRINGIFY_(-W,warningopt)) # endif #else /* ifdef __GNUC__ */ /* not gcc at all */ |