diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-14 15:55:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 16:03:23 +0100 |
| commit | ee59dff09c4f2ace54c43b597e216fce463a9a06 (patch) | |
| tree | 619f82eb2867d05b390f1d228dcaf88942178957 /ucb | |
| parent | 20803bd1dac462dedb670602c1ab4489f7f590fc (diff) | |
neon: stop using #pragma GCC system_header
... it breaks dependency generation.
Change-Id: I524f1789c32a633e8930a4e36a893ce02de66390
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 1 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonTypes.hxx | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 17e43bb94e5f..f76dc0926c45 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -27,7 +27,6 @@ ************************************************************************/ -#include <ne_locks.h> #include <ne_uri.h> #include "rtl/ustring.hxx" #include "osl/time.h" diff --git a/ucb/source/ucp/webdav-neon/NeonTypes.hxx b/ucb/source/ucp/webdav-neon/NeonTypes.hxx index cc40eb265e8f..636ae8fa70a6 100644 --- a/ucb/source/ucp/webdav-neon/NeonTypes.hxx +++ b/ucb/source/ucp/webdav-neon/NeonTypes.hxx @@ -34,7 +34,15 @@ #include <ne_utils.h> #include <ne_basic.h> #include <ne_props.h> + +#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif #include <ne_locks.h> +#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE +# pragma GCC diagnostic pop +#endif typedef ne_session HttpSession; typedef ne_status HttpStatus; |