diff options
| author | Lukas Larsson <[email protected]> | 2015-08-26 11:18:29 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2015-12-15 10:05:43 +0100 |
| commit | fdc2ce62a041d34cd99413e278e7dd8ff79832d1 (patch) | |
| tree | 24529c2bc49751bfd78b28ce3adff90c2b9ec37a | |
| parent | 37f057fca161373bf565ea1bf24fbe89d4946b48 (diff) | |
| download | otp-fdc2ce62a041d34cd99413e278e7dd8ff79832d1.tar.gz otp-fdc2ce62a041d34cd99413e278e7dd8ff79832d1.tar.bz2 otp-fdc2ce62a041d34cd99413e278e7dd8ff79832d1.zip | |
erts: Change name of child_setup to erl_child_setup
| -rw-r--r-- | erts/emulator/Makefile.in | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index c5080d5b5d..802de21ef0 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -398,7 +398,7 @@ EMULATOR_EXECUTABLE = beam$(TF_MARKER).dll else EMULATOR_EXECUTABLE = beam$(TF_MARKER) endif -CS_EXECUTABLE = child_setup$(TYPEMARKER) +CS_EXECUTABLE = erl_child_setup$(TYPEMARKER) # ---------------------------------------------------------------------- diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 5f7f07940d..1cb7f72a2b 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -195,10 +195,8 @@ extern void erl_crash_dump(char* file, int line, char* fmt, ...); #define ERL_BUILD_TYPE_MARKER #endif -#define CHILD_SETUP_PROG_NAME "child_setup" ERL_BUILD_TYPE_MARKER -#if !DISABLE_VFORK +#define CHILD_SETUP_PROG_NAME "erl_child_setup" ERL_BUILD_TYPE_MARKER static char *child_setup_prog; -#endif #ifdef DEBUG static int debug_log = 0; |