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 | |
| parent | 20803bd1dac462dedb670602c1ab4489f7f590fc (diff) | |
neon: stop using #pragma GCC system_header
... it breaks dependency generation.
Change-Id: I524f1789c32a633e8930a4e36a893ce02de66390
| -rw-r--r-- | external/neon/neon.patch | 13 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 1 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonTypes.hxx | 8 |
3 files changed, 8 insertions, 14 deletions
diff --git a/external/neon/neon.patch b/external/neon/neon.patch index 95d6b55024b3..de52043d3dc1 100644 --- a/external/neon/neon.patch +++ b/external/neon/neon.patch @@ -174,19 +174,6 @@ ctx->found = 1; } } ---- src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100 -+++ src/ne_locks.h 2011-02-03 10:26:21.000000000 +0100 -@@ -22,6 +22,10 @@ - #ifndef NE_LOCKS_H - #define NE_LOCKS_H - -+# if defined __GNUC__ -+# pragma GCC system_header -+# endif -+ - #include "ne_request.h" /* for ne_session + ne_request */ - #include "ne_uri.h" /* for ne_uri */ - --- src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200 +++ src/ne_sspi.c 2011-02-03 10:26:21.000000000 +0100 @@ -206,6 +206,45 @@ 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; |