From 2bd72eb53d825ddada76fa4e288cadbcd81733a0 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 22 May 2000 17:20:29 +0000
Subject: [PATCH] =?UTF-8?q?J=F6rn's=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Makefile.m32 | 4 ++--
 src/main.c       | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index d398083fb..41b840c3d 100644
--- 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 d629de9e7..1ee45fe3e 100644
--- 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;