diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-01-09 14:54:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-14 09:09:03 +0100 |
| commit | ad028c4110f3ccb5db1b105c716995ad71b877aa (patch) | |
| tree | 4e8e43a206c97458cbd5a80146ea1d040b8ad429 /src | |
| parent | d41fbea2ba84959dd860f2a9c651e7eea260b008 (diff) | |
Fix compile when verify is already defined
On Mac if AssertMacros.h has already been included then it defines
verify which conflicts with the verify static function. Therefore we
just undef this if is already defined.
Task-number: QTBUG-27316
Change-Id: I5960e504c4efa4fc4ff65ba66bbd7decb33ffc62
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 6863fb9d62..6301956e78 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -43,6 +43,10 @@ #ifndef QSSLCERTIFICATE_H #define QSSLCERTIFICATE_H +#ifdef verify +#undef verify +#endif + #include <QtCore/qnamespace.h> #include <QtCore/qbytearray.h> #include <QtCore/qcryptographichash.h> |