Jörn's fixes

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index d398083fb675cb336af13c033025d101b9b617a9..41b840c3d68b1289b9ef996d03eb242fe08fa507 100644 (file)
--- a/src/Makefile.m32
+++ b/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 $@

diff --git a/src/main.c b/src/main.c
index d629de9e71856faf97f7ae60e228d18f1ac0e06a..1ee45fe3ec3833057f584d118b220c283801901e 100644 (file)
--- a/src/main.c
+++ b/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;