diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:35:36 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:35:36 +0000 |
commit | fdabdbca60ee915d2ebaa35e38863acd09dc1eb8 (patch) | |
tree | 5c3f2470e510cace1b4fcec2811e5f913470e5da /ucb | |
parent | bd335c56c5a5b046adb3ff49a70cf0557db849a6 (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')
-rw-r--r-- | ucb/source/ucp/webdav/NeonUri.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx index 21af95748e..cc2efb95e1 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", |