mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
Jrn's fixes
This commit is contained in:
parent
c35238e0a3
commit
2bd72eb53d
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
CC = gcc
|
CC = gcc
|
||||||
STRIP = strip -s
|
STRIP = strip -s
|
||||||
OPENSSL_PATH = ../../openssl-0.9.4
|
OPENSSL_PATH = ../../openssl-0.9.5a
|
||||||
|
|
||||||
# We may need these someday
|
# We may need these someday
|
||||||
# PERL = perl
|
# PERL = perl
|
||||||
@ -19,7 +19,7 @@ OPENSSL_PATH = ../../openssl-0.9.4
|
|||||||
## Nothing more to do below this line!
|
## Nothing more to do below this line!
|
||||||
|
|
||||||
INCLUDES = -I. -I.. -I../include
|
INCLUDES = -I. -I.. -I../include
|
||||||
CFLAGS = -g -O2 -DGLOBURL -DCURL_SEPARATORS
|
CFLAGS = -g -O2
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
|
COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
|
||||||
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||||
|
@ -63,6 +63,10 @@
|
|||||||
/* This is now designed to have its own local setup.h */
|
/* This is now designed to have its own local setup.h */
|
||||||
#include "setup.h"
|
#include "setup.h"
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#include <winsock.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
#ifdef HAVE_IO_H /* typical win32 habit */
|
#ifdef HAVE_IO_H /* typical win32 habit */
|
||||||
@ -122,7 +126,7 @@ static void win32_cleanup(void)
|
|||||||
WSACleanup();
|
WSACleanup();
|
||||||
}
|
}
|
||||||
|
|
||||||
static UrgError win32_init(void)
|
static CURLcode win32_init(void)
|
||||||
{
|
{
|
||||||
WORD wVersionRequested;
|
WORD wVersionRequested;
|
||||||
WSADATA wsaData;
|
WSADATA wsaData;
|
||||||
|
Loading…
Reference in New Issue
Block a user