diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-02-23 05:34:25 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-02-23 05:34:25 +0000 |
| commit | 2ff6cfccd68b069ef05bc43b8f3f2e290aff0437 (patch) | |
| tree | 80b3200501897ca6d39d63377360f999c9a1047e /src/or/main.c | |
| parent | 55c3f15ed1334fc4f63e04c4edc4bb2340623fac (diff) | |
| download | tor-2ff6cfccd68b069ef05bc43b8f3f2e290aff0437.tar.gz tor-2ff6cfccd68b069ef05bc43b8f3f2e290aff0437.zip | |
Forward-port fix to make dual-purpose NT executable work.
svn:r3665
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 6ac83e1728..74b7b7dcda 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1645,11 +1645,14 @@ int tor_main(int argc, char *argv[]) { nt_service_main(); return 0; } -#else +#endif if (tor_init(argc, argv)<0) return -1; switch (get_options()->command) { case CMD_RUN_TOR: +#ifdef MS_WINDOWS_SERVICE + service_status.dwCurrentState = SERVICE_RUNNING; +#endif do_main_loop(); break; case CMD_LIST_FINGERPRINT: @@ -1664,6 +1667,5 @@ int tor_main(int argc, char *argv[]) { } tor_cleanup(); return -1; -#endif } |