diff options
| author | Rickard Green <[email protected]> | 2012-04-27 13:06:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-04-27 13:06:27 +0200 |
| commit | 398bb9a9a5b2a56f0333ce81efe00380692ec93a (patch) | |
| tree | adb7239744ae6f3d45f672e29d9c2bd97e0e67d9 /erts/emulator/sys | |
| parent | 52312a8b93e8b250099e2f1b1b802e63e37971cc (diff) | |
| parent | 3730e28ad736f0538141d4474e0038a9cc48df71 (diff) | |
| download | otp-398bb9a9a5b2a56f0333ce81efe00380692ec93a.tar.gz otp-398bb9a9a5b2a56f0333ce81efe00380692ec93a.tar.bz2 otp-398bb9a9a5b2a56f0333ce81efe00380692ec93a.zip | |
Merge branch 'rickard/proc-sched/OTP-9892'
* rickard/proc-sched/OTP-9892:
Teach etp-commands to understand new emulator internal data structures
Optimize process state changes
Optimize process table access
Implement possibility to use ordinary mutexes as process locks
Conflicts:
erts/emulator/beam/erl_alloc.types
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 5 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/sys_time.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 03298a6c54..21c52ca26d 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -90,6 +90,11 @@ #define strncasecmp _strnicmp +#ifndef __GNUC__ +# undef ERTS_I64_LITERAL +# define ERTS_I64_LITERAL(X) X##i64 +#endif + /* * Practial Windows specific macros. */ diff --git a/erts/emulator/sys/win32/sys_time.c b/erts/emulator/sys/win32/sys_time.c index b5123dc45d..2f2dfc8197 100644 --- a/erts/emulator/sys/win32/sys_time.c +++ b/erts/emulator/sys/win32/sys_time.c @@ -26,11 +26,7 @@ #include "sys.h" #include "assert.h" -#ifdef __GNUC__ -#define LL_LITERAL(X) X##LL -#else -#define LL_LITERAL(X) X##i64 -#endif +#define LL_LITERAL(X) ERTS_I64_LITERAL(X) /******************* Routines for time measurement *********************/ |