ucb: kill webdav-neon/warnings_guard_ne_locks.h too

Change-Id: I44919cf592eee026116fc5fbc12e0d5baa4bda2b

4 files changed, 5 insertions, 38 deletions

diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
index 890402c6a1a4..17e43bb94e5f 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 
-#include "warnings_guard_ne_locks.h"
+#include <ne_locks.h>
 #include <ne_uri.h>
 #include "rtl/ustring.hxx"
 #include "osl/time.h"
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
index 529158e588b7..8d3b22fb001e 100644
--- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx
@@ -30,7 +30,9 @@
 
 #include <config_lgpl.h>
 #include <map>
-#include "warnings_guard_ne_locks.h"
+
+#include <ne_locks.h>
+
 #include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
 #include "NeonTypes.hxx"
diff --git a/ucb/source/ucp/webdav-neon/NeonTypes.hxx b/ucb/source/ucp/webdav-neon/NeonTypes.hxx
index 926529f74a3a..cc40eb265e8f 100644
--- a/ucb/source/ucp/webdav-neon/NeonTypes.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonTypes.hxx
@@ -34,7 +34,7 @@
 #include <ne_utils.h>
 #include <ne_basic.h>
 #include <ne_props.h>
-#include "warnings_guard_ne_locks.h"
+#include <ne_locks.h>
 
 typedef ne_session                  HttpSession;
 typedef ne_status                   HttpStatus;
diff --git a/ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h b/ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h
deleted file mode 100644
index 0cccdf47100b..000000000000
--- a/ucb/source/ucp/webdav-neon/warnings_guard_ne_locks.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
-#define INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
-
-// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation
-// units and more important affects the rest of the current include file, the
-// warnings guard is separated into this header file on its own.
-
-/*
-    Silence down this WaE:
-    /usr/include/neon/ne_locks.h:125:51: warning: 'int ne_lock(ne_session*, ne_lock*)'
-    hides constructor for 'struct ne_lock' [-Wshadow]
-*/
-
-#ifdef _MSC_VER
-#pragma warning(push, 1)
-#elif defined __GNUC__
-#pragma GCC system_header
-#endif
-#include <ne_locks.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif // INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */