diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 09:26:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 09:26:55 +0000 |
| commit | e1718b5b49b97ce9f59036696aa59cb3bb28640b (patch) | |
| tree | 88d37a444f8c53d799dc1f716b17af4a68c03088 /shell | |
| parent | 5ed50f29b0c30156124602582d08bdecec20700b (diff) | |
INTEGRATION: CWS kdeheaders (1.3.8); FILE MERGED
2006/07/30 03:28:41 pjanik 1.3.8.1: #i66722#: disable shadow warnings for gcc.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/kdebe/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index d6f6e5ce36e5..c31a6b448845 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: obo $ $Date: 2006-07-13 13:21:39 $ +# last change: $Author: ihi $ $Date: 2006-08-01 10:26:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,13 @@ INCPRE=$(UNOUCROUT) .INCLUDE : settings.mk +# For some of the included external KDE headers, GCC complains about shadowed +# symbols in instantiated template code only at the end of a compilation unit, +# so the only solution is to disable that warning here: +.IF "$(COM)" == "GCC" +CFLAGSCXX+=-Wno-shadow +.ENDIF + UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt # no "lib" prefix |