- ws2_32 Winetest: Define __ROS_LONG64__

- rpcrt4 Winetest: Fix an implicit declaration warning -- this should be sent to Wine

svn path=/trunk/; revision=38897

diff --git a/rostests/winetests/rpcrt4/server.c b/rostests/winetests/rpcrt4/server.c
index 77a0d5a..3b8847b 100644 (file)
--- a/rostests/winetests/rpcrt4/server.c
+++ b/rostests/winetests/rpcrt4/server.c
@@ -351,12 +351,6 @@ s_check_se2(se_t *s)
   ok(s->f == E2, "check_se2\n");
 }
 
-int
-s_sum_parr(int *a[3])
-{
-  return s_sum_pcarr(a, 3);
-}
-
 int
 s_sum_pcarr(int *a[], int n)
 {
@@ -366,6 +360,12 @@ s_sum_pcarr(int *a[], int n)
   return s;
 }
 
+int
+s_sum_parr(int *a[3])
+{
+  return s_sum_pcarr(a, 3);
+}
+
 int
 s_enum_ord(e_t e)
 {

diff --git a/rostests/winetests/rpcrt4/warningfix.diff b/rostests/winetests/rpcrt4/warningfix.diff
new file mode 100644 (file)
index 0000000..3982629
--- /dev/null
+++ b/rostests/winetests/rpcrt4/warningfix.diff
@@ -0,0 +1,30 @@
+Index: server.c\r
+===================================================================\r
+--- server.c   (revision 38883)\r
++++ server.c   (working copy)\r
+@@ -352,12 +352,6 @@\r
+ }
+ 
+ int
+-s_sum_parr(int *a[3])
+-{
+-  return s_sum_pcarr(a, 3);
+-}
+-
+-int
+ s_sum_pcarr(int *a[], int n)
+ {
+   int i, s = 0;
+@@ -367,6 +361,12 @@\r
+ }
+ 
+ int
++s_sum_parr(int *a[3])
++{
++  return s_sum_pcarr(a, 3);
++}
++
++int
+ s_enum_ord(e_t e)
+ {
+   switch (e)

diff --git a/rostests/winetests/ws2_32/ws2_32.rbuild b/rostests/winetests/ws2_32/ws2_32.rbuild
index 9111ade..be58483 100644 (file)
--- a/rostests/winetests/ws2_32/ws2_32.rbuild
+++ b/rostests/winetests/ws2_32/ws2_32.rbuild
@@ -4,6 +4,7 @@
 <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>
        <file>sock.c</file>
        <file>testlist.c</file>