From d930440ae53aa9796cfdf377f6ecd147cb15fa5a Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 5 Feb 2007 21:48:53 +0000
Subject: [PATCH]  r11648@catbus:  nickm | 2007-02-05 16:48:50 -0500  Fix bugs
 in last nt services patch: syntax, typename.

svn:r9488
---
 src/or/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index a1b145bf71..b0d07034a5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -69,6 +69,7 @@ int has_completed_circuit=0;
 
 #ifdef MS_WINDOWS
 #define MS_WINDOWS_SERVICE
+#includ "Windows.h"
 #endif
 
 #ifdef MS_WINDOWS_SERVICE
@@ -2156,7 +2157,7 @@ nt_service_install(int argc, char **argv)
   char *errmsg;
   const char *user_acct = GENSRV_USERACCT;
   int i,r;
-  SID_NAMED_USE sidUse;
+  SID_NAME_USE sidUse;
 
   if (nt_service_loadlibrary()<0)
     return -1;
@@ -2170,7 +2171,7 @@ nt_service_install(int argc, char **argv)
     service_fns.CloseServiceHandle_fn(hSCManager);
     return -1;
   }
-  for (i=1; i < argc, ++i) {
+  for (i=1; i < argc; ++i) {
     if (!strcmp(i, "--user") && i+1<argc) {
       user_acct = argv[i+1];
       ++i;