[packages/libreoffice.git] / openoffice.org-gcc-Wextra.patch

--- solenv/inc/unxbsdi.mk	2007-12-12 13:18:23.000000000 +0000
+++ solenv/inc-new/unxbsdi.mk	2008-03-10 09:16:59.398817758 +0000
@@ -100,7 +100,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxbsdi2.mk	2007-12-12 13:18:36.000000000 +0000
+++ solenv/inc-new/unxbsdi2.mk	2008-03-10 09:16:59.402151012 +0000
@@ -110,7 +110,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxbsds.mk	2007-12-12 13:18:50.000000000 +0000
+++ solenv/inc-new/unxbsds.mk	2008-03-10 09:16:59.402151012 +0000
@@ -101,7 +101,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxfbsd.mk	2007-12-12 13:19:03.000000000 +0000
+++ solenv/inc-new/unxfbsd.mk	2008-03-10 09:16:59.402151012 +0000
@@ -123,7 +123,7 @@
 CFLAGSOUTOBJ=-o
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
--- solenv/inc/unxlnga.mk	2008-03-10 07:36:42.039925934 +0000
+++ solenv/inc-new/unxlnga.mk	2008-03-10 09:16:59.412150776 +0000
@@ -131,7 +131,7 @@
 CFLAGSOUTOBJ=-o
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
--- solenv/inc/unxlngi4.mk	2008-03-10 07:36:49.826409660 +0000
+++ solenv/inc-new/unxlngi4.mk	2008-03-10 09:16:59.415484030 +0000
@@ -122,7 +122,7 @@
 .ENDIF
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxlngi6.mk	2008-03-10 07:36:50.066404021 +0000
+++ solenv/inc-new/unxlngi6.mk	2008-03-10 09:16:59.412150776 +0000
@@ -128,7 +128,7 @@
 CFLAGSOUTOBJ=-o
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
--- solenv/inc/unxlngmips.mk	2007-11-02 15:20:37.000000000 +0000
+++ solenv/inc-new/unxlngmips.mk	2008-03-10 09:16:59.405484267 +0000
@@ -128,7 +128,7 @@
 CFLAGSOUTOBJ=-o
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
--- solenv/inc/unxlngp.mk	2007-03-09 09:09:38.000000000 +0000
+++ solenv/inc-new/unxlngp.mk	2008-03-10 09:16:59.405484267 +0000
@@ -83,7 +83,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxlngppc.mk	2008-03-10 07:36:48.483107887 +0000
+++ solenv/inc-new/unxlngppc.mk	2008-03-10 09:16:59.405484267 +0000
@@ -127,7 +127,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxlngppc4.mk	2007-12-12 13:20:25.000000000 +0000
+++ solenv/inc-new/unxlngppc4.mk	2008-03-10 09:16:59.405484267 +0000
@@ -118,7 +118,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxlngs.mk	2008-03-10 07:36:48.486441142 +0000
+++ solenv/inc-new/unxlngs.mk	2008-03-10 09:16:59.408817521 +0000
@@ -126,7 +126,7 @@
 .ENDIF
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxlngx6.mk	2008-03-10 07:36:50.066404021 +0000
+++ solenv/inc-new/unxlngx6.mk	2008-03-10 09:16:59.415484030 +0000
@@ -131,7 +131,7 @@
 CFLAGSOUTOBJ=-o
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
--- solenv/inc/unxlnxi.mk	2007-03-09 09:10:59.000000000 +0000
+++ solenv/inc-new/unxlnxi.mk	2008-03-10 09:16:59.408817521 +0000
@@ -81,7 +81,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/unxmacx.mk	2008-03-10 07:36:39.959974801 +0000
+++ solenv/inc-new/unxmacx.mk	2008-03-10 09:16:59.412150776 +0000
@@ -143,7 +143,7 @@
 CFLAGSNOOPT=-O0
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-# -Wextra doesn not work for gcc-3.3
+# doesn not work for gcc-3.3
 CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor
--- solenv/inc/unxscoi.mk	2007-03-09 09:11:23.000000000 +0000
+++ solenv/inc-new/unxscoi.mk	2008-03-10 09:16:59.408817521 +0000
@@ -68,7 +68,7 @@
 CFLAGSWARNCC=
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCC=-Wall -Wendif-labels
 CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
 CFLAGSWERRCC=-Werror
 
--- solenv/inc/wntgcci6.mk	2007-10-15 12:42:14.000000000 +0000
+++ solenv/inc-new/wntgcci6.mk	2008-03-10 09:16:59.408817521 +0000
@@ -78,7 +78,7 @@
 CDEFS+=-DWIN32 -DWINVER=0x400 -D_WIN32_IE=0x400 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
 
 # -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
     -Wno-non-virtual-dtor -Wno-uninitialized
 CFLAGSWALLCC=$(CFLAGSWARNCC)
Commit	Line	Data
b48b5c65 AM	1	--- solenv/inc/unxbsdi.mk 2007-12-12 13:18:23.000000000 +0000
	2	+++ solenv/inc-new/unxbsdi.mk 2008-03-10 09:16:59.398817758 +0000
	3	@@ -100,7 +100,7 @@
	4	CFLAGSWARNCC=
	5	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
	6	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
	7	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
	8	+CFLAGSWALLCC=-Wall -Wendif-labels
	9	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
	10	CFLAGSWERRCC=-Werror
	11
	12	--- solenv/inc/unxbsdi2.mk 2007-12-12 13:18:36.000000000 +0000
	13	+++ solenv/inc-new/unxbsdi2.mk 2008-03-10 09:16:59.402151012 +0000
	14	@@ -110,7 +110,7 @@
	15	CFLAGSWARNCC=
	16	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
	17	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
	18	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
	19	+CFLAGSWALLCC=-Wall -Wendif-labels
	20	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
	21	CFLAGSWERRCC=-Werror
	22
	23	--- solenv/inc/unxbsds.mk 2007-12-12 13:18:50.000000000 +0000
	24	+++ solenv/inc-new/unxbsds.mk 2008-03-10 09:16:59.402151012 +0000
	25	@@ -101,7 +101,7 @@
	26	CFLAGSWARNCC=
	27	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
	28	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
	29	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
	30	+CFLAGSWALLCC=-Wall -Wendif-labels
	31	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
	32	CFLAGSWERRCC=-Werror
	33
	34	--- solenv/inc/unxfbsd.mk 2007-12-12 13:19:03.000000000 +0000
	35	+++ solenv/inc-new/unxfbsd.mk 2008-03-10 09:16:59.402151012 +0000
	36	@@ -123,7 +123,7 @@
	37	CFLAGSOUTOBJ=-o
	38
	39	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
	40	-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
	41	+CFLAGSWARNCC=-Wall -Wendif-labels
	42	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
	43	-Wno-non-virtual-dtor
	44	CFLAGSWALLCC=$(CFLAGSWARNCC)
	45	--- solenv/inc/unxlnga.mk 2008-03-10 07:36:42.039925934 +0000
	46	+++ solenv/inc-new/unxlnga.mk 2008-03-10 09:16:59.412150776 +0000
	47	@@ -131,7 +131,7 @@
	48	CFLAGSOUTOBJ=-o
	49
	50	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
	51	-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
	52	+CFLAGSWARNCC=-Wall -Wendif-labels
	53	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
	54	-Wno-non-virtual-dtor
	55	CFLAGSWALLCC=$(CFLAGSWARNCC)
	56	--- solenv/inc/unxlngi4.mk 2008-03-10 07:36:49.826409660 +0000
	57	+++ solenv/inc-new/unxlngi4.mk 2008-03-10 09:16:59.415484030 +0000
	58	@@ -122,7 +122,7 @@
	59	.ENDIF
	60	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
	61	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
	62	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
	63	+CFLAGSWALLCC=-Wall -Wendif-labels
	64	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
65	CFLAGSWERRCC=-Werror
66
67	--- solenv/inc/unxlngi6.mk 2008-03-10 07:36:50.066404021 +0000
68	+++ solenv/inc-new/unxlngi6.mk 2008-03-10 09:16:59.412150776 +0000
69	@@ -128,7 +128,7 @@
70	CFLAGSOUTOBJ=-o
71
72	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
73	-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
74	+CFLAGSWARNCC=-Wall -Wendif-labels
75	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
76	-Wno-non-virtual-dtor
77	CFLAGSWALLCC=$(CFLAGSWARNCC)
78	--- solenv/inc/unxlngmips.mk 2007-11-02 15:20:37.000000000 +0000
79	+++ solenv/inc-new/unxlngmips.mk 2008-03-10 09:16:59.405484267 +0000
80	@@ -128,7 +128,7 @@
81	CFLAGSOUTOBJ=-o
82
83	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
84	-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
85	+CFLAGSWARNCC=-Wall -Wendif-labels
86	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
87	-Wno-non-virtual-dtor
88	CFLAGSWALLCC=$(CFLAGSWARNCC)
89	--- solenv/inc/unxlngp.mk 2007-03-09 09:09:38.000000000 +0000
90	+++ solenv/inc-new/unxlngp.mk 2008-03-10 09:16:59.405484267 +0000
91	@@ -83,7 +83,7 @@
92	CFLAGSWARNCC=
93	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
94	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
95	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
96	+CFLAGSWALLCC=-Wall -Wendif-labels
97	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
98	CFLAGSWERRCC=-Werror
99
100	--- solenv/inc/unxlngppc.mk 2008-03-10 07:36:48.483107887 +0000
101	+++ solenv/inc-new/unxlngppc.mk 2008-03-10 09:16:59.405484267 +0000
102	@@ -127,7 +127,7 @@
103	CFLAGSWARNCC=
104	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
105	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
106	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
107	+CFLAGSWALLCC=-Wall -Wendif-labels
108	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
109	CFLAGSWERRCC=-Werror
110
111	--- solenv/inc/unxlngppc4.mk 2007-12-12 13:20:25.000000000 +0000
112	+++ solenv/inc-new/unxlngppc4.mk 2008-03-10 09:16:59.405484267 +0000
113	@@ -118,7 +118,7 @@
114	CFLAGSWARNCC=
115	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
116	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
117	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
118	+CFLAGSWALLCC=-Wall -Wendif-labels
119	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
120	CFLAGSWERRCC=-Werror
121
122	--- solenv/inc/unxlngs.mk 2008-03-10 07:36:48.486441142 +0000
123	+++ solenv/inc-new/unxlngs.mk 2008-03-10 09:16:59.408817521 +0000
124	@@ -126,7 +126,7 @@
125	.ENDIF
126	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
127	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
128	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
129	+CFLAGSWALLCC=-Wall -Wendif-labels
130	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
131	CFLAGSWERRCC=-Werror
132
133	--- solenv/inc/unxlngx6.mk 2008-03-10 07:36:50.066404021 +0000
134	+++ solenv/inc-new/unxlngx6.mk 2008-03-10 09:16:59.415484030 +0000
135	@@ -131,7 +131,7 @@
136	CFLAGSOUTOBJ=-o
137
138	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
139	-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
140	+CFLAGSWARNCC=-Wall -Wendif-labels
141	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
142	-Wno-non-virtual-dtor
143	CFLAGSWALLCC=$(CFLAGSWARNCC)
144	--- solenv/inc/unxlnxi.mk 2007-03-09 09:10:59.000000000 +0000
145	+++ solenv/inc-new/unxlnxi.mk 2008-03-10 09:16:59.408817521 +0000
146	@@ -81,7 +81,7 @@
147	CFLAGSWARNCC=
148	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
149	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
150	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
151	+CFLAGSWALLCC=-Wall -Wendif-labels
152	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
153	CFLAGSWERRCC=-Werror
154
155	--- solenv/inc/unxmacx.mk 2008-03-10 07:36:39.959974801 +0000
156	+++ solenv/inc-new/unxmacx.mk 2008-03-10 09:16:59.412150776 +0000
157	@@ -143,7 +143,7 @@
158	CFLAGSNOOPT=-O0
159
160	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
161	-# -Wextra doesn not work for gcc-3.3
162	+# doesn not work for gcc-3.3
163	CFLAGSWARNCC=-Wall -Wendif-labels
164	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
165	-Wno-non-virtual-dtor
166	--- solenv/inc/unxscoi.mk 2007-03-09 09:11:23.000000000 +0000
167	+++ solenv/inc-new/unxscoi.mk 2008-03-10 09:16:59.408817521 +0000
168	@@ -68,7 +68,7 @@
169	CFLAGSWARNCC=
170	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
171	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
172	-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
173	+CFLAGSWALLCC=-Wall -Wendif-labels
174	CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
175	CFLAGSWERRCC=-Werror
176
177	--- solenv/inc/wntgcci6.mk 2007-10-15 12:42:14.000000000 +0000
178	+++ solenv/inc-new/wntgcci6.mk 2008-03-10 09:16:59.408817521 +0000
179	@@ -78,7 +78,7 @@
180	CDEFS+=-DWIN32 -DWINVER=0x400 -D_WIN32_IE=0x400 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
181
182	# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
183	-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
184	+CFLAGSWARNCC=-Wall -Wendif-labels
185	CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
186	-Wno-non-virtual-dtor -Wno-uninitialized
187	CFLAGSWALLCC=$(CFLAGSWARNCC)