Alexandre Julliard : rpcrt4/tests: Replace || by |.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Nov 9 13:58:05 CST 2006


Module: wine
Branch: master
Commit: c0f9d369dc578bd1d5cfefad2852c5690668a8fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c0f9d369dc578bd1d5cfefad2852c5690668a8fc

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Nov  9 18:20:49 2006 +0100

rpcrt4/tests: Replace || by |.

---

 dlls/rpcrt4/tests/ndr_marshall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index e441698..58428c2 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -660,7 +660,7 @@ static void test_simple_struct(void)
     s1.c = 0xa5;
     s1.l1 = 0xdeadbeef;
     s1.l2 = 0xcafebabe;
-    s1.ll = ((LONGLONG) 0xbadefeed << 32) || 0x2468ace0;
+    s1.ll = ((LONGLONG) 0xbadefeed << 32) | 0x2468ace0;
 
     wiredatalen = 24;
     memcpy(wiredata, &s1, wiredatalen); 




More information about the wine-cvs mailing list