diff options
author | Lukas Larsson <[email protected]> | 2012-06-01 10:53:19 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2012-06-01 10:53:19 +0200 |
commit | 4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0 (patch) | |
tree | aa4c8c4fb80ad16b3185d94dc0a972b17fe1082d /erts/test/erl_print_SUITE_data/erl_print_tests.c | |
parent | 523516d049cd246fd68f5ec69c56fd4d5b8172f5 (diff) | |
parent | b82c337dfce2d5bc1e435ebaa6060cb982bc5ad6 (diff) | |
download | otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.tar.gz otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.tar.bz2 otp-4c70878ddf1ef065e7e83395c96a7d9e9c4e27b0.zip |
Merge branch 'maint'
* maint:
Ignore calls to wx* modules if it is undefined
Fix erl_interface testcases
Update gccifier to respect -link option
Extand timetrap for escript tests
Fix compilation issues on windows and Ubuntu 12.04
Ignore common_test bootstrap
Diffstat (limited to 'erts/test/erl_print_SUITE_data/erl_print_tests.c')
-rw-r--r-- | erts/test/erl_print_SUITE_data/erl_print_tests.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/test/erl_print_SUITE_data/erl_print_tests.c b/erts/test/erl_print_SUITE_data/erl_print_tests.c index 28ce78f4e1..82b0c21132 100644 --- a/erts/test/erl_print_SUITE_data/erl_print_tests.c +++ b/erts/test/erl_print_SUITE_data/erl_print_tests.c @@ -44,8 +44,8 @@ #endif #ifdef __WIN32__ -#define signed_long_long LONGLONG -#define unsigned_long_long ULONGLONG +#define signed_long_long __int64 +#define unsigned_long_long unsigned __int64 #else #define signed_long_long signed long long #define unsigned_long_long unsigned long long |