[Libreoffice-commits] .: solenv/inc

[Fridrich Strba]

 solenv/inc/wntgcci.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2e267c98bd001929fb922f565b65d92365a8d390
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Oct 10 22:27:40 2011 +0200

    Clone Caolán's work for wntgcci.mk too

diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 5fe8bbd..3831c85 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -79,10 +79,10 @@ CDEFS+=-D_DLL
 .ENDIF
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+CFLAGSWARNBOTH=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=$(CFLAGSWARNBOTH) -Wdeclaration-after-statement
+CFLAGSWARNCXX=$(CFLAGSWARNBOTH) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
-CFLAGSWARNCC+=-Wdeclaration-after-statement
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
 CFLAGSWERRCC=-Werror -DLIBO_WERROR