Fix compilation of ntmain.c.

svn:r11395

1 files changed, 10 insertions, 6 deletions

diff --git a/src/or/main.c b/src/or/main.c
index 651b46f077..e6e45ecb97 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -12,6 +12,7 @@ const char main_c_id[] =
  * connections, implements main loop, and drives scheduled events.
  **/
 
+#define MAIN_PRIVATE
 #include "or.h"
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
@@ -1302,7 +1303,7 @@ do_hup(void)
 }
 
 /** Tor main loop. */
-static int
+/* static */ int
 do_main_loop(void)
 {
   int loop_result;
@@ -1697,7 +1698,7 @@ handle_signals(int is_parent)
 
 /** Main entry point for the Tor command-line client.
  */
-static int
+/* static */ int
 tor_init(int argc, char *argv[])
 {
   char buf[256];
@@ -1834,7 +1835,7 @@ tor_cleanup(void)
 }
 
 /** Read/create keys as needed, and echo our fingerprint to stdout. */
-static int
+/* static */ int
 do_list_fingerprint(void)
 {
   char buf[FINGERPRINT_LEN+1];
@@ -1864,7 +1865,7 @@ do_list_fingerprint(void)
 
 /** Entry point for password hashing: take the desired password from
  * the command line, and print its salted hash to stdout. **/
-static void
+/* static */ void
 do_hash_password(void)
 {
 
@@ -1902,8 +1903,11 @@ tor_main(int argc, char *argv[])
   log_notice(LD_CONFIG, "Set up dmalloc; returned %d", r);
 #endif
 #ifdef NT_SERVICE
-  if ((result = nt_service_parse_options(argv, argc)))
-    return result;
+  {
+     int done = 0;
+     result = nt_service_parse_options(argc, argv, &done);
+     if (done) return result;
+  }
 #endif
   if (tor_init(argc, argv)<0)
     return -1;