Skip to content
Snippets Groups Projects
Commit 022f1766 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Added a define in the Mingw32 makefiles to allow parts of the config-win32

files depend on that as well. It turned out Borland has no unistd.h file
either, only mingw32 seems to use that.
parent 3e20192f
No related branches found
No related tags found
No related merge requests found
......@@ -173,7 +173,7 @@
/*************************************************
* This section is for compiler specific defines.*
*************************************************/
#ifndef VC6 /* VC6 => Microsoft Visual C++ 6 */
#ifdef MINGW32 /* Borland and MS don't have this */
/* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
......
......@@ -15,7 +15,7 @@ OPENSSL_PATH = ../../openssl-0.9.5a
## Nothing more to do below this line!
INCLUDES = -I. -I.. -I../include
CFLAGS = -g -O2
CFLAGS = -g -O2 -DMINGW32
ifdef SSL
INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
CFLAGS += -DUSE_SSLEAY
......@@ -29,14 +29,14 @@ base64.h getenv.h mprintf.c setup.h url.c download.c getpass.c \
mprintf.h ssluse.c url.h download.h hostip.c netrc.c ssluse.h \
urldata.h formdata.c hostip.h netrc.h stdcheaders.h formdata.h \
if2ip.c progress.c sendf.c sendf.h speedcheck.c speedcheck.h \
ftp.c ftp.h getpass.c getpass.h version.c timeval.c timeval.h cookie.c \
ftp.c ftp.h getpass.h version.c timeval.c timeval.h cookie.c \
cookie.h escape.c escape.h getdate.c getdate.h dict.h dict.c http.c \
http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h \
highlevel.c strequal.c strequal.h easy.c
libcurl_a_OBJECTS = base64.o getenv.o mprintf.o url.o download.o \
getpass.o ssluse.o hostip.o netrc.o formdata.o if2ip.o progress.o \
sendf.o speedcheck.o ftp.o getpass.o version.o timeval.o \
sendf.o speedcheck.o ftp.o version.o timeval.o \
cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o \
highlevel.o strequal.o easy.o
......
......@@ -19,7 +19,7 @@ OPENSSL_PATH = ../../openssl-0.9.5a
## Nothing more to do below this line!
INCLUDES = -I. -I.. -I../include
CFLAGS = -g -O2
CFLAGS = -g -O2 -DMINGW32
LDFLAGS =
COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
......
......@@ -8,11 +8,21 @@
/* Define cpu-machine-OS */
#define OS "win32"
/* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define if you have the <io.h> header file. */
#define HAVE_IO_H 1
/* Define if you have the strdup function. */
#define HAVE_STRDUP 1
/* Define if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
/*************************************************
* This section is for compiler specific defines.*
*************************************************/
#ifdef MINGW32 /* Borland and MS don't have this */
/* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment