projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Multiple fixes for Windows x86 p/invoke test failures. (#3186)
[mono.git]
/
mono
/
tests
/
libtest.c
diff --git
a/mono/tests/libtest.c
b/mono/tests/libtest.c
index 1f2930da9655300e0a32a48da28c4f7ec9d69bd1..8f1cef273f40075165310ad858c344b9fb71324f 100644
(file)
--- a/
mono/tests/libtest.c
+++ b/
mono/tests/libtest.c
@@
-889,12
+889,12
@@
mono_test_marshal_return_delegate (SimpleDelegate delegate)
return delegate;
}
return delegate;
}
-typedef int
DelegateByrefDelegate
(void *);
+typedef int
(STDCALL *DelegateByrefDelegate)
(void *);
LIBTEST_API int STDCALL
mono_test_marshal_delegate_ref_delegate (DelegateByrefDelegate del)
{
LIBTEST_API int STDCALL
mono_test_marshal_delegate_ref_delegate (DelegateByrefDelegate del)
{
- int (*ptr) (int i);
+ int (
STDCALL
*ptr) (int i);
del (&ptr);
del (&ptr);
@@
-1243,7
+1243,7
@@
mono_test_marshal_stringbuilder_ref (char **s)
* C/C++ standard and the runtime.
*/
typedef struct {
* C/C++ standard and the runtime.
*/
typedef struct {
-#if !defined(__GNUC__) ||
(defined(TARGET_WIN32) && defined(TARGET_AMD64)
)
+#if !defined(__GNUC__) ||
defined(TARGET_WIN32
)
char a;
#endif
} EmptyStruct;
char a;
#endif
} EmptyStruct;