J�rn's fixes

src/Makefile.m32

@@ -9,7 +9,7 @@
 
 CC = gcc
 STRIP = strip -s
-OPENSSL_PATH = ../../openssl-0.9.4
+OPENSSL_PATH = ../../openssl-0.9.5a
 
 # We may need these someday
 # PERL = perl
@@ -19,7 +19,7 @@ OPENSSL_PATH = ../../openssl-0.9.4
 ## Nothing more to do below this line!
 
 INCLUDES = -I. -I.. -I../include
-CFLAGS = -g -O2 -DGLOBURL -DCURL_SEPARATORS
+CFLAGS = -g -O2
 LDFLAGS = 
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@

src/main.c

@@ -63,6 +63,10 @@
 /* This is now designed to have its own local setup.h */
 #include "setup.h"
 
+#ifdef WIN32
+#include <winsock.h>
+#endif
+
 #include "version.h"
 
 #ifdef HAVE_IO_H /* typical win32 habit */
@@ -122,7 +126,7 @@ static void win32_cleanup(void)
   WSACleanup();
 }
 
-static UrgError win32_init(void)
+static CURLcode win32_init(void)
 {
   WORD wVersionRequested;  
   WSADATA wsaData;