diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-12-19 12:24:07 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-12-19 22:17:33 +0100 |
| commit | 4f0a97a81dc9aa93dd6579590110a1ea71154351 (patch) | |
| tree | 33de617704daff61f19036f9b7e1fc3285bbeca2 | |
| parent | 9663341f9249c739219ffe6cccf3762aa8dd78f3 (diff) | |
Clang 3.5 has -Wreturn-type-c-linkage
Change-Id: I9d4b8aef3877f46c537937f7cb04c7654f057fa2
Reviewed-on: https://gerrit.libreoffice.org/46789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | include/osl/diagnose.hxx | 3 | ||||
| -rw-r--r-- | sal/osl/all/debugbase.cxx | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx index 0dc140faef83..7cd0c106a584 100644 --- a/include/osl/diagnose.hxx +++ b/include/osl/diagnose.hxx @@ -65,9 +65,6 @@ SAL_DLLPUBLIC void SAL_CALL osl_detail_ObjectRegistry_revokeObject( // that would break binary compatibility. #ifdef __clang__ #pragma clang diagnostic push -// Guard against slightly older clang versions that don't have -// -Wreturn-type-c-linkage... -#pragma clang diagnostic ignored "-Wunknown-pragmas" #pragma clang diagnostic ignored "-Wreturn-type-c-linkage" #endif diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index 3c2f6c67b1e7..3534b9a828c4 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -68,9 +68,6 @@ extern "C" { // that would break binary compatibility. #ifdef __clang__ #pragma clang diagnostic push -// Guard against slightly older clang versions that don't have -// -Wreturn-type-c-linkage... -#pragma clang diagnostic ignored "-Wunknown-pragmas" #pragma clang diagnostic ignored "-Wreturn-type-c-linkage" #endif |