- Fix compiler flag for rosautotest

- Get rid of -Wno-format in the Winetests, replacing it with __ROS_LONG64__.

svn path=/trunk/; revision=41453

diff --git a/rostests/rosautotest/rosautotest.rbuild b/rostests/rosautotest/rosautotest.rbuild
index 3d591a7..e1ad3e3 100644 (file)
--- a/rostests/rosautotest/rosautotest.rbuild
+++ b/rostests/rosautotest/rosautotest.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="rosautotest" type="win32cui" installbase="system32" installname="rosautotest.exe" unicode="yes">
-       <compilerflag compiler="cxx">-fno-rtti</compilerflag>
+       <compilerflag compiler="cxx" compilerset="gcc">-fno-rtti</compilerflag>
        <include base="rosautotest">.</include>
        <library>advapi32</library>
        <library>kernel32</library>

diff --git a/rostests/winetests/comctl32/comctl32.rbuild b/rostests/winetests/comctl32/comctl32.rbuild
index 1331dcc..2e45509 100644 (file)
--- a/rostests/winetests/comctl32/comctl32.rbuild
+++ b/rostests/winetests/comctl32/comctl32.rbuild
@@ -2,9 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comctl32_winetest" type="win32cui" installbase="bin" installname="comctl32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="comctl32_winetest">.</include>
-    <define name="__ROS_LONG64__" />
+       <define name="__ROS_LONG64__" />
        <file>comboex.c</file>
        <file>datetime.c</file>
        <file>dpa.c</file>

diff --git a/rostests/winetests/credui/credui.rbuild b/rostests/winetests/credui/credui.rbuild
index c3ee417..8f0f6c7 100644 (file)
--- a/rostests/winetests/credui/credui.rbuild
+++ b/rostests/winetests/credui/credui.rbuild
@@ -1,6 +1,6 @@
 <module name="credui_winetest" type="win32cui" installbase="bin" installname="credui_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="credui_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>credui.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/cryptnet/cryptnet.rbuild b/rostests/winetests/cryptnet/cryptnet.rbuild
index da645b4..3b9c8a3 100644 (file)
--- a/rostests/winetests/cryptnet/cryptnet.rbuild
+++ b/rostests/winetests/cryptnet/cryptnet.rbuild
@@ -1,6 +1,6 @@
 <module name="cryptnet_winetest" type="win32cui" installbase="bin" installname="cryptnet_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="cryptnet_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>cryptnet.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/cryptui/cryptui.rbuild b/rostests/winetests/cryptui/cryptui.rbuild
index 87c02ac..2733b35 100644 (file)
--- a/rostests/winetests/cryptui/cryptui.rbuild
+++ b/rostests/winetests/cryptui/cryptui.rbuild
@@ -1,6 +1,6 @@
 <module name="cryptui_winetest" type="win32cui" installbase="bin" installname="cryptui_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="cryptui_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>cryptui.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/dnsapi/dnsapi.rbuild b/rostests/winetests/dnsapi/dnsapi.rbuild
index af95072..fa4c8b7 100644 (file)
--- a/rostests/winetests/dnsapi/dnsapi.rbuild
+++ b/rostests/winetests/dnsapi/dnsapi.rbuild
@@ -1,6 +1,6 @@
 <module name="dnsapi_winetest" type="win32cui" installbase="bin" installname="dnsapi_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="dnsapi_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>name.c</file>
        <file>record.c</file>
        <file>testlist.c</file>

diff --git a/rostests/winetests/fusion/fusion.rbuild b/rostests/winetests/fusion/fusion.rbuild
index 07bc550..db37aa3 100644 (file)
--- a/rostests/winetests/fusion/fusion.rbuild
+++ b/rostests/winetests/fusion/fusion.rbuild
@@ -1,6 +1,6 @@
 <module name="fusion_winetest" type="win32cui" installbase="bin" installname="fusion_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="fusion_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>asmcache.c</file>
        <file>asmenum.c</file>
        <file>asmname.c</file>

diff --git a/rostests/winetests/gdi32/gdi32.rbuild b/rostests/winetests/gdi32/gdi32.rbuild
index c865e35..9726a05 100644 (file)
--- a/rostests/winetests/gdi32/gdi32.rbuild
+++ b/rostests/winetests/gdi32/gdi32.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="gdi32_winetest">.</include>
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>

diff --git a/rostests/winetests/inetcomm/inetcomm.rbuild b/rostests/winetests/inetcomm/inetcomm.rbuild
index 9f2b9eb..0eaaa72 100644 (file)
--- a/rostests/winetests/inetcomm/inetcomm.rbuild
+++ b/rostests/winetests/inetcomm/inetcomm.rbuild
@@ -1,6 +1,6 @@
 <module name="inetcomm_winetest" type="win32cui" installbase="bin" installname="inetcomm_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="inetcomm_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>mimeintl.c</file>
        <file>mimeole.c</file>
        <file>testlist.c</file>

diff --git a/rostests/winetests/inetmib1/inetmib1.rbuild b/rostests/winetests/inetmib1/inetmib1.rbuild
index 9e13b26..8ed78cb 100644 (file)
--- a/rostests/winetests/inetmib1/inetmib1.rbuild
+++ b/rostests/winetests/inetmib1/inetmib1.rbuild
@@ -1,6 +1,6 @@
 <module name="inetmib1_winetest" type="win32cui" installbase="bin" installname="inetmib1_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="inetmib1_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>main.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/itss/itss.rbuild b/rostests/winetests/itss/itss.rbuild
index 5a95a1d..ee81500 100644 (file)
--- a/rostests/winetests/itss/itss.rbuild
+++ b/rostests/winetests/itss/itss.rbuild
@@ -1,6 +1,6 @@
 <module name="itss_winetest" type="win32cui" installbase="bin" installname="itss_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="itss_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>protocol.c</file>
        <file>rsrc.rc</file>
        <file>testlist.c</file>

diff --git a/rostests/winetests/kernel32/kernel32.rbuild b/rostests/winetests/kernel32/kernel32.rbuild
index 8ea74c8..ad47c0e 100644 (file)
--- a/rostests/winetests/kernel32/kernel32.rbuild
+++ b/rostests/winetests/kernel32/kernel32.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="kernel32_winetest">.</include>
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>

diff --git a/rostests/winetests/localspl/localspl.rbuild b/rostests/winetests/localspl/localspl.rbuild
index 64e056e..2fb7d3f 100644 (file)
--- a/rostests/winetests/localspl/localspl.rbuild
+++ b/rostests/winetests/localspl/localspl.rbuild
@@ -1,6 +1,6 @@
 <module name="localspl_winetest" type="win32cui" installbase="bin" installname="localspl_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="localspl_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>localmon.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/localui/localui.rbuild b/rostests/winetests/localui/localui.rbuild
index b7ae0bd..21e163d 100644 (file)
--- a/rostests/winetests/localui/localui.rbuild
+++ b/rostests/winetests/localui/localui.rbuild
@@ -1,6 +1,6 @@
 <module name="localui_winetest" type="win32cui" installbase="bin" installname="localui_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="localui_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>localui.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/mscms/mscms.rbuild b/rostests/winetests/mscms/mscms.rbuild
index 8b6747e..24f2765 100644 (file)
--- a/rostests/winetests/mscms/mscms.rbuild
+++ b/rostests/winetests/mscms/mscms.rbuild
@@ -1,6 +1,6 @@
 <module name="mscms_winetest" type="win32cui" installbase="bin" installname="mscms_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="mscms_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>profile.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/msctf/msctf.rbuild b/rostests/winetests/msctf/msctf.rbuild
index c8e061f..3298acc 100644 (file)
--- a/rostests/winetests/msctf/msctf.rbuild
+++ b/rostests/winetests/msctf/msctf.rbuild
@@ -1,6 +1,6 @@
 <module name="msctf_winetest" type="win32cui" installbase="bin" installname="msctf_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="msctf_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>inputprocessor.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/msvcrt/msvcrt.rbuild b/rostests/winetests/msvcrt/msvcrt.rbuild
index 0601d98..85befd9 100644 (file)
--- a/rostests/winetests/msvcrt/msvcrt.rbuild
+++ b/rostests/winetests/msvcrt/msvcrt.rbuild
@@ -2,10 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msvcrt_winetest" type="win32cui" installbase="bin" installname="msvcrt_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="msvcrt_winetest">.</include>
        <include base="msvcrt">include/reactos/wine/msvcrt</include>
-    <define name="__ROS_LONG64__" />
+       <define name="__ROS_LONG64__" />
        <define name="_CRT_NONSTDC_NO_DEPRECATE" />
        <library>kernel32</library>
        <library>msvcrt</library>

diff --git a/rostests/winetests/msvcrtd/msvcrtd.rbuild b/rostests/winetests/msvcrtd/msvcrtd.rbuild
index 99b3564..5a2ede1 100644 (file)
--- a/rostests/winetests/msvcrtd/msvcrtd.rbuild
+++ b/rostests/winetests/msvcrtd/msvcrtd.rbuild
@@ -1,6 +1,6 @@
 <module name="msvcrtd_winetest" type="win32cui" installbase="bin" installname="msvcrtd_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="msvcrtd_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>debug.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/msvfw32/msvfw32.rbuild b/rostests/winetests/msvfw32/msvfw32.rbuild
index 42b97c5..b3c14ca 100644 (file)
--- a/rostests/winetests/msvfw32/msvfw32.rbuild
+++ b/rostests/winetests/msvfw32/msvfw32.rbuild
@@ -1,6 +1,6 @@
 <module name="msvfw32_winetest" type="win32cui" installbase="bin" installname="msvfw32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="msvfw32_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>msvfw.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/msxml3/msxml3.rbuild b/rostests/winetests/msxml3/msxml3.rbuild
index 4cf1b33..3fa8b4d 100644 (file)
--- a/rostests/winetests/msxml3/msxml3.rbuild
+++ b/rostests/winetests/msxml3/msxml3.rbuild
@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msxml3_winetest" type="win32cui" installbase="bin" installname="msxml3_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="msxml3_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>domdoc.c</file>
        <file>saxreader.c</file>
        <file>schema.c</file>

diff --git a/rostests/winetests/ntdsapi/ntdsapi.rbuild b/rostests/winetests/ntdsapi/ntdsapi.rbuild
index 89b4b00..fd4a5b5 100644 (file)
--- a/rostests/winetests/ntdsapi/ntdsapi.rbuild
+++ b/rostests/winetests/ntdsapi/ntdsapi.rbuild
@@ -1,6 +1,6 @@
 <module name="ntdsapi_winetest" type="win32cui" installbase="bin" installname="ntdsapi_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="ntdsapi_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>ntdsapi.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/ntprint/ntprint.rbuild b/rostests/winetests/ntprint/ntprint.rbuild
index 4782d65..52b0625 100644 (file)
--- a/rostests/winetests/ntprint/ntprint.rbuild
+++ b/rostests/winetests/ntprint/ntprint.rbuild
@@ -1,6 +1,6 @@
 <module name="ntprint_winetest" type="win32cui" installbase="bin" installname="ntprint_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="ntprint_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>ntprint.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/oleacc/oleacc.rbuild b/rostests/winetests/oleacc/oleacc.rbuild
index ce229a5..aafe109 100644 (file)
--- a/rostests/winetests/oleacc/oleacc.rbuild
+++ b/rostests/winetests/oleacc/oleacc.rbuild
@@ -1,6 +1,6 @@
 <module name="oleacc_winetest" type="win32cui" installbase="bin" installname="oleacc_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="oleacc_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>main.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/pdh/pdh.rbuild b/rostests/winetests/pdh/pdh.rbuild
index 9b46c61..f8a653e 100644 (file)
--- a/rostests/winetests/pdh/pdh.rbuild
+++ b/rostests/winetests/pdh/pdh.rbuild
@@ -1,6 +1,6 @@
 <module name="pdh_winetest" type="win32cui" installbase="bin" installname="pdh_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="pdh_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>pdh.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/qmgr/qmgr.rbuild b/rostests/winetests/qmgr/qmgr.rbuild
index c95589a..dab7072 100644 (file)
--- a/rostests/winetests/qmgr/qmgr.rbuild
+++ b/rostests/winetests/qmgr/qmgr.rbuild
@@ -1,6 +1,6 @@
 <module name="qmgr_winetest" type="win32cui" installbase="bin" installname="qmgr_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="qmgr_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>enum_files.c</file>
        <file>enum_jobs.c</file>
        <file>file.c</file>

diff --git a/rostests/winetests/quartz/quartz.rbuild b/rostests/winetests/quartz/quartz.rbuild
index 5afeb6d..60cb3b6 100644 (file)
--- a/rostests/winetests/quartz/quartz.rbuild
+++ b/rostests/winetests/quartz/quartz.rbuild
@@ -1,6 +1,6 @@
 <module name="quartz_winetest" type="win32cui" installbase="bin" installname="quartz_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="quartz_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>avisplitter.c</file>
        <file>filtergraph.c</file>
        <file>filtermapper.c</file>

diff --git a/rostests/winetests/rasapi32/rasapi32.rbuild b/rostests/winetests/rasapi32/rasapi32.rbuild
index 58c0dc6..964a155 100644 (file)
--- a/rostests/winetests/rasapi32/rasapi32.rbuild
+++ b/rostests/winetests/rasapi32/rasapi32.rbuild
@@ -1,6 +1,6 @@
 <module name="rasapi32_winetest" type="win32cui" installbase="bin" installname="rasapi32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="rasapi32_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>rasapi.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/riched20/riched20.rbuild b/rostests/winetests/riched20/riched20.rbuild
index 050e151..b8afebd 100644 (file)
--- a/rostests/winetests/riched20/riched20.rbuild
+++ b/rostests/winetests/riched20/riched20.rbuild
@@ -2,9 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="riched20_winetest" type="win32cui" installbase="bin" installname="riched20_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="riched20_winetest">.</include>
-    <define name="__ROS_LONG64__" />
+       <define name="__ROS_LONG64__" />
        <file>editor.c</file>
        <file>richole.c</file>
        <file>testlist.c</file>

diff --git a/rostests/winetests/riched32/riched32.rbuild b/rostests/winetests/riched32/riched32.rbuild
index 25d22ce..a1580b9 100644 (file)
--- a/rostests/winetests/riched32/riched32.rbuild
+++ b/rostests/winetests/riched32/riched32.rbuild
@@ -2,9 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="riched32_winetest" type="win32cui" installbase="bin" installname="riched32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="riched32_winetest">.</include>
-    <define name="__ROS_LONG64__" />
+       <define name="__ROS_LONG64__" />
        <file>editor.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/rpcrt4/rpcrt4.rbuild b/rostests/winetests/rpcrt4/rpcrt4.rbuild
index a793ccd..7b7a5e9 100644 (file)
--- a/rostests/winetests/rpcrt4/rpcrt4.rbuild
+++ b/rostests/winetests/rpcrt4/rpcrt4.rbuild
@@ -8,7 +8,6 @@
                <file>server.idl</file>
        </module>
        <module name="rpcrt4_winetest" type="win32cui" installbase="bin" installname="rpcrt4_winetest.exe" allowwarnings="true">
-               <compilerflag compiler="cc">-Wno-format</compilerflag>
                <include base="rpcrt4_winetest">.</include>
                <include root="intermediate" base="rpcrt4_winetest">.</include>
                <define name="__ROS_LONG64__" />

diff --git a/rostests/winetests/secur32/secur32.rbuild b/rostests/winetests/secur32/secur32.rbuild
index e6544eb..38919ae 100644 (file)
--- a/rostests/winetests/secur32/secur32.rbuild
+++ b/rostests/winetests/secur32/secur32.rbuild
@@ -1,6 +1,6 @@
 <module name="secur32_winetest" type="win32cui" installbase="bin" installname="secur32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="secur32_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>main.c</file>
        <file>ntlm.c</file>
        <file>schannel.c</file>

diff --git a/rostests/winetests/serialui/serialui.rbuild b/rostests/winetests/serialui/serialui.rbuild
index b677339..d8293f9 100644 (file)
--- a/rostests/winetests/serialui/serialui.rbuild
+++ b/rostests/winetests/serialui/serialui.rbuild
@@ -1,6 +1,6 @@
 <module name="serialui_winetest" type="win32cui" installbase="bin" installname="serialui_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="serialui_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>confdlg.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/setupapi/setupapi.rbuild b/rostests/winetests/setupapi/setupapi.rbuild
index 2907392..80e8d53 100644 (file)
--- a/rostests/winetests/setupapi/setupapi.rbuild
+++ b/rostests/winetests/setupapi/setupapi.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="setupapi_winetest">.</include>
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>

diff --git a/rostests/winetests/shdocvw/shdocvw.rbuild b/rostests/winetests/shdocvw/shdocvw.rbuild
index ef90f60..8d65bd2 100644 (file)
--- a/rostests/winetests/shdocvw/shdocvw.rbuild
+++ b/rostests/winetests/shdocvw/shdocvw.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shdocvw_winetest" type="win32cui" installbase="bin" installname="shdocvw_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="shdocvw_winetest">.</include>
        <define name="__ROS_LONG64__" />
        <file>intshcut.c</file>

diff --git a/rostests/winetests/snmpapi/snmpapi.rbuild b/rostests/winetests/snmpapi/snmpapi.rbuild
index 3073787..49cc1d2 100644 (file)
--- a/rostests/winetests/snmpapi/snmpapi.rbuild
+++ b/rostests/winetests/snmpapi/snmpapi.rbuild
@@ -1,6 +1,6 @@
 <module name="snmpapi_winetest" type="win32cui" installbase="bin" installname="snmpapi_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="snmpapi_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>util.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/spoolss/spoolss.rbuild b/rostests/winetests/spoolss/spoolss.rbuild
index 89f3c13..462ed44 100644 (file)
--- a/rostests/winetests/spoolss/spoolss.rbuild
+++ b/rostests/winetests/spoolss/spoolss.rbuild
@@ -1,6 +1,6 @@
 <module name="spoolss_winetest" type="win32cui" installbase="bin" installname="spoolss_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="spoolss_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>spoolss.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/twain_32/twain_32.rbuild b/rostests/winetests/twain_32/twain_32.rbuild
index db6e338..786ba21 100644 (file)
--- a/rostests/winetests/twain_32/twain_32.rbuild
+++ b/rostests/winetests/twain_32/twain_32.rbuild
@@ -1,6 +1,6 @@
 <module name="twain_32_winetest" type="win32cui" installbase="bin" installname="twain_32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="twain_32_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>dsm.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/user32/user32.rbuild b/rostests/winetests/user32/user32.rbuild
index cd56c62..580c0eb 100644 (file)
--- a/rostests/winetests/user32/user32.rbuild
+++ b/rostests/winetests/user32/user32.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="user32_winetest">.</include>
     <include base="ReactOS">include/reactos/wine</include>
     <define name="__ROS_LONG64__" />

diff --git a/rostests/winetests/userenv/userenv.rbuild b/rostests/winetests/userenv/userenv.rbuild
index 0f8a64e..621b330 100644 (file)
--- a/rostests/winetests/userenv/userenv.rbuild
+++ b/rostests/winetests/userenv/userenv.rbuild
@@ -1,6 +1,6 @@
 <module name="userenv_winetest" type="win32cui" installbase="bin" installname="userenv_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="userenv_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>userenv.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/wintrust/wintrust.rbuild b/rostests/winetests/wintrust/wintrust.rbuild
index a003870..31d4f79 100644 (file)
--- a/rostests/winetests/wintrust/wintrust.rbuild
+++ b/rostests/winetests/wintrust/wintrust.rbuild
@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wintrust_winetest" type="win32cui" installbase="bin" installname="wintrust_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="wintrust_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>asn.c</file>
        <file>crypt.c</file>
        <file>register.c</file>

diff --git a/rostests/winetests/wlanapi/wlanapi.rbuild b/rostests/winetests/wlanapi/wlanapi.rbuild
index 50bb8b9..4e33b4e 100644 (file)
--- a/rostests/winetests/wlanapi/wlanapi.rbuild
+++ b/rostests/winetests/wlanapi/wlanapi.rbuild
@@ -2,9 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wlanapi_winetest" type="win32cui" installbase="bin" installname="wlanapi_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="wininet_winetest">.</include>
-    <define name="__ROS_LONG64__" />
+       <define name="__ROS_LONG64__" />
        <library>wine</library>
        <library>wlanapi</library>
        <library>kernel32</library>

diff --git a/rostests/winetests/wldap32/wldap32.rbuild b/rostests/winetests/wldap32/wldap32.rbuild
index a0953b2..06f6f6f 100644 (file)
--- a/rostests/winetests/wldap32/wldap32.rbuild
+++ b/rostests/winetests/wldap32/wldap32.rbuild
@@ -1,6 +1,6 @@
 <module name="wldap32_winetest" type="win32cui" installbase="bin" installname="wldap32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="wldap32_winetest">.</include>
+       <define name="__ROS_LONG64__" />
        <file>parse.c</file>
        <file>testlist.c</file>
        <library>wine</library>

diff --git a/rostests/winetests/ws2_32/ws2_32.rbuild b/rostests/winetests/ws2_32/ws2_32.rbuild
index be58483..4b644b6 100644 (file)
--- a/rostests/winetests/ws2_32/ws2_32.rbuild
+++ b/rostests/winetests/ws2_32/ws2_32.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ws2_32_winetest" type="win32cui" installbase="bin" installname="ws2_32_winetest.exe" allowwarnings="true">
-       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="ws2_32_winetest">.</include>
        <define name="__ROS_LONG64__" />
        <file>protocol.c</file>