ffi_test: Can actually test 62 and 63 on windows.

db4
Doug Coleman 2014-11-10 10:30:35 -08:00
parent 564a67ce7e
commit 466fe4559d
3 changed files with 20 additions and 17 deletions

View File

@ -896,24 +896,25 @@ os windows? [
S{ bool-and-ptr { b t } { ptr f } } S{ bool-and-ptr { b t } { ptr f } }
} [ ffi_test_61 ] unit-test } [ ffi_test_61 ] unit-test
STRUCT: uint-pair ] unless
STRUCT: uint-pair
{ a uint } { a uint }
{ b uint } ; { b uint } ;
FUNCTION: uint-pair ffi_test_62 ( ) ; FUNCTION: uint-pair ffi_test_62 ( ) ;
{ {
S{ uint-pair { a 0xabcdefab } { b 0x12345678 } } S{ uint-pair { a 0xabcdefab } { b 0x12345678 } }
} [ ffi_test_62 ] unit-test } [ ffi_test_62 ] unit-test
STRUCT: ulonglong-pair STRUCT: ulonglong-pair
{ a ulonglong } { a ulonglong }
{ b ulonglong } ; { b ulonglong } ;
FUNCTION: ulonglong-pair ffi_test_63 ( ) ; FUNCTION: ulonglong-pair ffi_test_63 ( ) ;
{ {
S{ ulonglong-pair { a 0xabcdefabcdefabcd } { b 0x1234567891234567 } } S{ ulonglong-pair { a 0xabcdefabcdefabcd } { b 0x1234567891234567 } }
} [ ffi_test_63 ] unit-test } [ ffi_test_63 ] unit-test
] unless

View File

@ -317,6 +317,8 @@ struct bool_and_ptr ffi_test_61() {
return bap; return bap;
} }
#endif
struct uint_pair ffi_test_62() { struct uint_pair ffi_test_62() {
struct uint_pair uip; struct uint_pair uip;
uip.a = 0xabcdefab; uip.a = 0xabcdefab;
@ -331,4 +333,3 @@ struct ulonglong_pair ffi_test_63() {
return ullp; return ullp;
} }
#endif

View File

@ -215,6 +215,8 @@ struct bool_and_ptr {
FACTOR_EXPORT struct bool_and_ptr ffi_test_61(); FACTOR_EXPORT struct bool_and_ptr ffi_test_61();
#endif
struct uint_pair { struct uint_pair {
unsigned int a; unsigned int a;
unsigned int b; unsigned int b;
@ -229,4 +231,3 @@ struct ulonglong_pair {
FACTOR_EXPORT struct ulonglong_pair ffi_test_63(); FACTOR_EXPORT struct ulonglong_pair ffi_test_63();
#endif