[or-cvs] r9488: Fix bugs in last nt services patch: syntax, typename. (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-02-05 16:48:53 -0500 (Mon, 05 Feb 2007)
New Revision: 9488

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
Log:
 r11648@catbus:  nickm | 2007-02-05 16:48:50 -0500
 Fix bugs in last nt services patch: syntax, typename.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11648] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2007-02-05 21:15:52 UTC (rev 9487)
+++ tor/trunk/src/or/main.c	2007-02-05 21:48:53 UTC (rev 9488)
@@ -69,6 +69,7 @@
 
 #ifdef MS_WINDOWS
 #define MS_WINDOWS_SERVICE
+#includ "Windows.h"
 #endif
 
 #ifdef MS_WINDOWS_SERVICE
@@ -2156,7 +2157,7 @@
   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 @@
     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;