diff options
| author | Patrik Nyblom <[email protected]> | 2011-12-02 15:27:13 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:27:40 +0100 |
| commit | 0d273c54d93fd0ddf03f98d138f302442a0f65f9 (patch) | |
| tree | 635977fc0ef2b8236c9d619c014a8b9f1d07af42 /erts/include | |
| parent | 86cd971ea4fee5fb596cd06e0dc8da60f4cf65d1 (diff) | |
| parent | 42286b769c3cb6b9f8dd2dccf31e4232d6795d4e (diff) | |
| download | otp-0d273c54d93fd0ddf03f98d138f302442a0f65f9.tar.gz otp-0d273c54d93fd0ddf03f98d138f302442a0f65f9.tar.bz2 otp-0d273c54d93fd0ddf03f98d138f302442a0f65f9.zip | |
Merge branch 'pan/win64-port'
* pan/win64-port:
Update static cache
Back to not using 32bit time_t
Remove ancient WaitForInputIdle workaround
Iron out bugs in Win64 found in daily builds
Make Win64 build work both under MSYS and Cygwin
Fix aclocal.m4 to override changes in opu
Make whole of OTP build and release on Win64
Get cerl and distribution working in Win64
Get working prompt in Win64 using bootstrap code
Build Win64 Erlang emulator using MSYS
Add static win64 cache
OTP-9130
OTP-9766
Diffstat (limited to 'erts/include')
| -rw-r--r-- | erts/include/erl_int_sizes_config.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/include/erl_int_sizes_config.h.in b/erts/include/erl_int_sizes_config.h.in index 4b8a8e1b98..693f5b11a8 100644 --- a/erts/include/erl_int_sizes_config.h.in +++ b/erts/include/erl_int_sizes_config.h.in @@ -32,5 +32,8 @@ /* The number of bytes in a long long. */ #undef SIZEOF_LONG_LONG +/* The size of a pointer. */ +#undef SIZEOF_VOID_P + /* Define if building a halfword-heap 64bit emulator (needed for NIF's) */ #undef HALFWORD_HEAP_EMULATOR |