diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-16 14:41:28 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-16 14:41:28 +0200 |
| commit | a6b27d639e5c7c85e765331cfe7befbe23c4954b (patch) | |
| tree | 745d5193470835be21d79eff015ca9f06194ce97 /erts/etc/win32/erlsrv/erlsrv_interactive.h | |
| parent | 0c41940bef1d80b6b335cb0a77d5608d9bbe27fd (diff) | |
| parent | 604967b4c184249d8604f327bb4e683e2c453de8 (diff) | |
| download | otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.tar.gz otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.tar.bz2 otp-a6b27d639e5c7c85e765331cfe7befbe23c4954b.zip | |
Merge branch 'pan/win_erlsrv_stop/OTP-9344' into dev
* pan/win_erlsrv_stop/OTP-9344:
Move init of smp rw mutex from init to sys_args to make sure that it is initialized before the first erts_sys_getenv call
Move erts_sys_env_init() to erts_sys_pre_init()
Remove _DEBUG from start_erl.c
Spelling correction in erlsrv doc
Convert windows start_erl to take rootdir on command line
Add command start_disabled to erlsrv
Add global lock for erlsrv to avoid races
Change start order so that service_event gets initialized before it's used
Diffstat (limited to 'erts/etc/win32/erlsrv/erlsrv_interactive.h')
| -rw-r--r-- | erts/etc/win32/erlsrv/erlsrv_interactive.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/etc/win32/erlsrv/erlsrv_interactive.h b/erts/etc/win32/erlsrv/erlsrv_interactive.h index deacf81899..602da24575 100644 --- a/erts/etc/win32/erlsrv/erlsrv_interactive.h +++ b/erts/etc/win32/erlsrv/erlsrv_interactive.h @@ -19,6 +19,8 @@ #ifndef _ERLSRV_INTERACTIVE_H #define _ERLSRV_INTERACTIVE_H +#define ERLSRV_INTERACTIVE_GLOBAL_SEMAPHORE "{468d6954-e355-415f-968f-d257cb0feef4}" + int interactive_main(int argc, char **argv); #endif /* _ERLSRV_INTERACTIVE_H */ |