[or-cvs] Fix windows build

[Nick Mathewson]

Update of /home/or/cvsroot/src/common
In directory moria.mit.edu:/tmp/cvs-serv4019/src/common

Modified Files:
	compat.c torgzip.c util.c 
Log Message:
Fix windows build

Index: compat.c
===================================================================
RCS file: /home/or/cvsroot/src/common/compat.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- compat.c	3 Nov 2004 07:29:03 -0000	1.4
+++ compat.c	4 Nov 2004 04:01:19 -0000	1.5
@@ -8,6 +8,7 @@
 #define _GNU_SOURCE
 
 #include "orconfig.h"
+#include "compat.h"
 
 #ifdef MS_WINDOWS
 #include <io.h>
@@ -65,7 +66,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "compat.h"
 #include "log.h"
 #include "util.h"
 

Index: torgzip.c
===================================================================
RCS file: /home/or/cvsroot/src/common/torgzip.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- torgzip.c	16 Oct 2004 22:28:11 -0000	1.4
+++ torgzip.c	4 Nov 2004 04:01:19 -0000	1.5
@@ -12,8 +12,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <assert.h>
-#include <zlib.h>
+#include <assert.h>
+#ifdef MS_WINDOWS
+#include "..\..\contrib\zlib\zlib.h"
+#else
+#include <zlib.h>
+#endif
 
 #include "util.h"
 #include "log.h"

Index: util.c
===================================================================
RCS file: /home/or/cvsroot/src/common/util.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- util.c	3 Nov 2004 19:15:38 -0000	1.166
+++ util.c	4 Nov 2004 04:01:19 -0000	1.167
@@ -14,6 +14,9 @@
 #define _GNU_SOURCE
 
 #include "orconfig.h"
+#include "util.h"
+#include "log.h"
+#include "crypto.h"
 
 /* XXXX probably some of these are unneeded. find out which. */
 #ifdef MS_WINDOWS
@@ -31,9 +34,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "util.h"
-#include "log.h"
-#include "crypto.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>