diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
| commit | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch) | |
| tree | 336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /networking/httpd.c | |
| parent | b15f68214da209b5b293039c09c00f490c0cc193 (diff) | |
| parent | 6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff) | |
| download | busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2 busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip | |
Merge busybox into merge
Fix merge conflict in miscutils/less.c.
Use exit_SUCCESS() where possible.
Diffstat (limited to 'networking/httpd.c')
| -rw-r--r-- | networking/httpd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index c9daa0638..5f7b3a4dd 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
| @@ -2865,7 +2865,7 @@ static void mingw_daemonize(char **argv) | |||
| 2865 | close(fd); | 2865 | close(fd); |
| 2866 | 2866 | ||
| 2867 | if (mingw_spawn_detach(new_argv)) | 2867 | if (mingw_spawn_detach(new_argv)) |
| 2868 | exit(EXIT_SUCCESS); /* parent */ | 2868 | exit_SUCCESS(); /* parent */ |
| 2869 | exit(EXIT_FAILURE); /* parent */ | 2869 | exit(EXIT_FAILURE); /* parent */ |
| 2870 | } | 2870 | } |
| 2871 | #endif | 2871 | #endif |