Fix LONG64 definition

diff --git a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h
index a2c05f0..494a8ea 100644 (file)
--- a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h
+++ b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.h
@@ -375,7 +375,7 @@ void ChangeNumberSequential(NumberSequential* p)
 bool IsCorrectNumberSequential(NumberSequential* p)
 {
        if(p->i32 != (-0x7fffffff - 1) || p->ui32 != 0xffffffff || p->s1 != -0x8000 || p->us1 != 0xffff || p->b != 0 ||
-               p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (uint64_t)-1234567890 ||
+               p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != -1234567890 ||
                p->ui64 != 1234567890 || (p->sgl) != 32.0 || p->d != 3.2)
        {
                return false;

diff --git a/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h b/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h
index 1a8b034..4d915ef 100644 (file)
--- a/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h
+++ b/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/ExpStructAsParamNative.h
@@ -405,7 +405,7 @@ void ChangeNumberSequential(NumberSequential* p)
 bool IsCorrectNumberSequential(NumberSequential* p)
 {
     if(p->i32 != INT_MIN || p->ui32 != 0xffffffff || p->s1 != -0x8000 || p->us1 != 0xffff || p->b != 0 ||
-        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (uint64_t)-1234567890 ||
+        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != -1234567890 ||
         p->ui64 != 1234567890 || (p->sgl) != 32.0 || p->d != 3.2)
     {
         return false;

diff --git a/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h b/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h
index 318035d..b497b61 100644 (file)
--- a/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h
+++ b/tests/src/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/SeqStructDelRevPInvokeNative.h
@@ -393,7 +393,7 @@ void ChangeNumberSequential(NumberSequential* p)
 bool IsCorrectNumberSequential(NumberSequential* p)
 {
     if(p->i32 != INT_MIN || p->ui32 != 0xffffffff || p->s1 != -0x8000 || p->us1 != 0xffff || p->b != 0 ||
-        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != (uint64_t)-1234567890 ||
+        p->sb != 0x7f ||p->i16 != -0x8000 || p->ui16 != 0xffff || p->i64 != -1234567890 ||
         p->ui64 != 1234567890 || (p->sgl) != 32.0 || p->d != 3.2)
     {
         return false;

diff --git a/tests/src/Interop/common/xplatform.h b/tests/src/Interop/common/xplatform.h
index e5ea136..5e05e64 100644 (file)
--- a/tests/src/Interop/common/xplatform.h
+++ b/tests/src/Interop/common/xplatform.h
@@ -18,7 +18,7 @@ typedef ptrdiff_t INT_PTR;
 typedef size_t UINT_PTR;
 
 typedef unsigned long long ULONG64;
-typedef unsigned long long LONG64;
+typedef long long LONG64;
 typedef double DOUBLE;
 typedef float FLOAT;
 typedef int INT, *LPINT;