summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2008-04-22 14:35:36 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2008-04-22 14:35:36 +0000
commit87b4db74c475690d7361d6a40f3f7698f5e55287 (patch)
tree39b86791f1c5e3885e462355e50a2094da0b9ad2 /ucb/source
parent2864db07f74b5b8ad4d4b82a69beaec3d5b5e365 (diff)
INTEGRATION: CWS hr50 (1.23.4); FILE MERGED
2008/03/05 17:44:29 hr 1.23.4.1: #i86574#: fix warning (gcc-4.2.3)
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/webdav/NeonUri.cxx12
1 files changed, 11 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx
index 6494581ead49..b1f8d9fbc4f5 100644
--- a/ucb/source/ucp/webdav/NeonUri.cxx
+++ b/ucb/source/ucp/webdav/NeonUri.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: NeonUri.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
* This file is part of OpenOffice.org.
*
@@ -53,6 +53,16 @@ using namespace webdav_ucp;
# pragma disable_warn
# endif
+#if defined __GNUC__
+#define GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+/* Diagnostics pragma was introduced with gcc-4.2.1 */
+#if GCC_VERSION > 40201
+#pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
+#endif
+
namespace {
const ne_uri g_sUriDefaultsHTTP = { "http",