From 4f0a97a81dc9aa93dd6579590110a1ea71154351 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 19 Dec 2017 12:24:07 +0100 Subject: Clang 3.5 has -Wreturn-type-c-linkage Change-Id: I9d4b8aef3877f46c537937f7cb04c7654f057fa2 Reviewed-on: https://gerrit.libreoffice.org/46789 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- include/osl/diagnose.hxx | 3 --- sal/osl/all/debugbase.cxx | 3 --- 2 files changed, 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 -- cgit