[Libreoffice-commits] .: solenv/gbuild solenv/inc

[Tor Lillqvist]

 solenv/gbuild/platform/windows.mk |    2 ++
 solenv/inc/wntmsc.mk              |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 093345dfae7db37b0b1f8a8736f8092243499b50
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Oct 4 14:06:10 2011 +0300

    Ditto for C4242

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 67f07b9..2db6f42 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -96,6 +96,7 @@ gb_CFLAGS := \
 	-wd4189 \
 	-wd4191 \
 	-wd4217 \
+	-wd4242 \
 	-wd4244 \
 	-wd4250 \
 	-wd4251 \
@@ -145,6 +146,7 @@ gb_CXXFLAGS := \
 	-wd4189 \
 	-wd4191 \
 	-wd4217 \
+	-wd4242 \
 	-wd4244 \
 	-wd4250 \
 	-wd4251 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 4bd2795..cc3edb2 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -193,7 +193,7 @@ CFLAGSOUTOBJ=-Fo
 #   '()' to '(void)'".
 # - "warning C4365: conversion from ... to ... signed/unsigned mismatch"
 
-CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4244 -wd4250 -wd4251 -wd4275 \
+CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4250 -wd4251 -wd4275 \
     -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \
     -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
     -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \