projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1784 from alexrp/profiler-init
[mono.git]
/
mono
/
tests
/
marshal7.cs
diff --git
a/mono/tests/marshal7.cs
b/mono/tests/marshal7.cs
index 02cfbbd40a6cacef016398732a3dc4323c730413..640f4a04d7822e98699f3a79b4b144833f1bed78 100644
(file)
--- a/
mono/tests/marshal7.cs
+++ b/
mono/tests/marshal7.cs
@@
-218,9
+218,9
@@
public class Test
if (Marshal.SizeOf (typeof (TestStruct10)) != 12)
return 16;
} else {
if (Marshal.SizeOf (typeof (TestStruct10)) != 12)
return 16;
} else {
- if (Marshal.SizeOf (typeof (TestStruct8)) != 16)
+ if (Marshal.SizeOf (typeof (TestStruct8)) != 16
&& Marshal.SizeOf (typeof (TestStruct8)) != 12
)
return 14;
return 14;
- if (Marshal.SizeOf (typeof (TestStruct10)) != 16)
+ if (Marshal.SizeOf (typeof (TestStruct10)) != 16
&& Marshal.SizeOf (typeof (TestStruct10)) != 12
)
return 16;
}
if (Marshal.SizeOf (typeof (TestStruct9)) != 12)
return 16;
}
if (Marshal.SizeOf (typeof (TestStruct9)) != 12)