[or-cvs] Compile on win32

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv3669/src/or

Modified Files:
	control.c main.c or.h 
Log Message:
Compile on win32

Index: control.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- control.c	20 Jun 2005 09:38:29 -0000	1.96
+++ control.c	27 Jun 2005 23:35:04 -0000	1.97
@@ -270,7 +270,7 @@
   const char *end;
   int i;
   int start_of_line;
-  for (i=0; i<len; ++i) {
+  for (i=0; i<(int)len; ++i) {
     if (data[i]== '\n')
       ++sz_out;
   }

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -d -r1.521 -r1.522
--- main.c	20 Jun 2005 18:56:35 -0000	1.521
+++ main.c	27 Jun 2005 23:35:04 -0000	1.522
@@ -16,25 +16,6 @@
 #include <dmalloc.h>
 #endif
 
-/* These signals are defined to help control_signal_act work.
- * XXXX Move into or.h or compat.h
- */
-#ifndef SIGHUP
-#define SIGHUP 1
-#endif
-#ifndef SIGINT
-#define SIGINT 2
-#endif
-#ifndef SIGUSR1
-#define SIGUSR1 10
-#endif
-#ifndef SIGUSR2
-#define SIGUSR2 12
-#endif
-#ifndef SIGTERM
-#define SIGTERM 15
-#endif
-
 /********* PROTOTYPES **********/
 
 static void dumpmemusage(int severity);

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -d -r1.620 -r1.621
--- or.h	20 Jun 2005 23:04:13 -0000	1.620
+++ or.h	27 Jun 2005 23:35:04 -0000	1.621
@@ -139,6 +139,25 @@
 #include "../common/util.h"
 #include "../common/torgzip.h"
 
+/* These signals are defined to help control_signal_act work.
+ * XXXX Move into compat.h ?
+ */
+#ifndef SIGHUP
+#define SIGHUP 1
+#endif
+#ifndef SIGINT
+#define SIGINT 2
+#endif
+#ifndef SIGUSR1
+#define SIGUSR1 10
+#endif
+#ifndef SIGUSR2
+#define SIGUSR2 12
+#endif
+#ifndef SIGTERM
+#define SIGTERM 15
+#endif
+
 #if (SIZEOF_CELL_T != 0)
 /* On Irix, stdlib.h defines a cell_t type, so we need to make sure
  * that our stuff always calls cell_t something different. */