diff options
| author | Lukas Larsson <[email protected]> | 2016-06-14 10:08:56 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-06-14 10:08:56 +0200 |
| commit | 64515dcead288dacf4876eb0502c755f08427977 (patch) | |
| tree | 266b5f2ca780c885d00efba6617e0145af0ab99e /lib/erl_interface/src | |
| parent | 2f3286f7eb10f7460e68cd268651e767e24048ef (diff) | |
| parent | fafacbdb5c3b8852e29da51933b708bbc57e8a0b (diff) | |
| download | otp-64515dcead288dacf4876eb0502c755f08427977.tar.gz otp-64515dcead288dacf4876eb0502c755f08427977.tar.bz2 otp-64515dcead288dacf4876eb0502c755f08427977.zip | |
Merge branch 'lukas/erl_interface/fix_long_windows/OTP-13673'
* lukas/erl_interface/fix_long_windows/OTP-13673:
erl_interface: Fix trace level tracing on windows
erl_interface: Fix decode_ulong on windows
Diffstat (limited to 'lib/erl_interface/src')
| -rw-r--r-- | lib/erl_interface/src/misc/show_msg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/erl_interface/src/misc/show_msg.c b/lib/erl_interface/src/misc/show_msg.c index 81accab4b6..5868cccba6 100644 --- a/lib/erl_interface/src/misc/show_msg.c +++ b/lib/erl_interface/src/misc/show_msg.c @@ -40,6 +40,8 @@ # include <time.h> # endif # endif +#else +# include <time.h> #endif #include "eiext.h" |