Commit 4223f602 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

djgpp fixes by Gisle Vanem

parent 8146d463

lib/config.dj

+100 −92
Original line number Diff line number Diff line 
#ifndef _CURL_CONFIG_DJGPP_H

#define _CURL_CONFIG_DJGPP_H



#define OS       "djgpp"

#define OS       "MSDOS/djgpp"

#define PACKAGE  "curl"



#define CURL_CA_BUNDLE  "/dev/env/CURL_CA_BUNDLE"
@@ -10,13 +10,8 @@ 
/* #define HAVE_DLOPEN 1 maybe not (DXE3) */

#endif



#if 1     /* use ioctlsocket() via fsext'ed fcntl() */

  #define HAVE_O_NONBLOCK 1

#else

  #define HAVE_IOCTLSOCKET 1

#endif



#define HAVE_ALARM             1

#define HAVE_ASSERT_T          1

#define HAVE_ARPA_INET_H       1

#define HAVE_CLOSESOCKET       1

#define HAVE_FCNTL_H           1
@@ -28,6 +23,8 @@ 
#define HAVE_INET_ADDR         1

#define HAVE_INET_NTOA         1

#define HAVE_IO_H              1

#define HAVE_IOCTLSOCKET       1

#define HAVE_INET_PTON         1

#define HAVE_MALLOC_H          1

#define HAVE_MEMORY_H          1

#define HAVE_NETDB_H           1
@@ -62,22 +59,33 @@ 
#define TIME_WITH_SYS_TIME     1



#define BSD

#define USE_ZLIB



/* #define MALLOCDEBUG */



#ifdef HAVE_OPENSSL_ENGINE_H   /* on cmd-line */

#ifdef USE_ZLIB     /* on cmd-line */

  #define HAVE_ZLIB_H            1

  #define HAVE_LIBZ              1

#endif



#ifdef USE_SSLEAY   /* on cmd-line */

  #define HAVE_OPENSSL_X509_H    1

  #define HAVE_OPENSSL_SSL_H     1

  #define HAVE_OPENSSL_RSA_H     1

  #define HAVE_OPENSSL_PEM_H     1

  #define HAVE_OPENSSL_ERR_H     1

  #define HAVE_OPENSSL_CRYPTO_H  1

  #define HAVE_OPENSSL_ENGINE_H  1

  #define HAVE_LIBSSL            1

  #define HAVE_LIBCRYPTO         1

  #define OPENSSL_NO_KRB5        1

#endif



/* Because djgpp < 2.03 doesn't have snprintf() etc.

 */

#if (DJGPP_MINOR < 4)

  #define _MPRINTF_REPLACE

#endif



#define in_addr_t  u_long

#define socklen_t  int

#define ssize_t    int

lib/makefile.dj

+175 −157
Original line number Diff line number Diff line
@@ -13,12 +13,13 @@ endif 


SOURCES = base64.c   connect.c  content_.c cookie.c   dict.c     \

          easy.c     escape.c   file.c     formdata.c ftp.c      \

          getdate.c  getenv.c   getinfo.c  getpass.c  hash.c   \

          hostip.c   http.c     http_chu.c if2ip.c    krb4.c   \

          ldap.c     llist.c    memdebug.c mprintf.c  multi.c  \

          netrc.c    progress.c security.c sendf.c    share.c  \

          speedche.c ssluse.c   strequal.c strtok.c   telnet.c \

          timeval.c  transfer.c url.c      version.c

          getdate.c  getenv.c   getinfo.c  hash.c     hostip.c   \

          http.c     http_chu.c http_dig.c http_neg.c http_ntl.c \

          if2ip.c    krb4.c     md5.c      ldap.c     llist.c    \

          memdebug.c mprintf.c  multi.c    netrc.c    progress.c \

          security.c sendf.c    share.c    speedche.c ssluse.c   \

          strequal.c strtok.c   telnet.c   timeval.c  transfer.c \

          url.c      version.c



OBJECTS  = $(SOURCES:.c=.o)

CURL_LIB = libcurl.a
@@ -35,7 +36,11 @@ getdate.c: getdate.y 
	$(YACC) -o $@ $^



clean:

	- rm -f $(OBJECTS) $(CURL_LIB) Makefile.bak config.h getdate.c

	- rm -f $(OBJECTS) Makefile.bak



realclean vclean: clean

	- rm -f config.h getdate.c $(CURL_LIB)





# DO NOT DELETE THIS LINE

base64.o: base64.c setup.h config.h config.dj ../include/curl/mprintf.h \
@@ -45,9 +50,10 @@ connect.o: connect.c setup.h config.h config.dj urldata.h cookie.h \ 
  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h sendf.h if2ip.h

content_.o: content_.c setup.h config.h config.dj

cookie.o: cookie.c setup.h config.h config.dj cookie.h \

cookie.o: cookie.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h getdate.h strequal.h strtok.h

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h getdate.h strequal.h strtok.h sendf.h

dict.o: dict.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \
@@ -56,7 +62,7 @@ dict.o: dict.c setup.h config.h config.dj urldata.h cookie.h \ 
easy.o: easy.c setup.h config.h config.dj strequal.h urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h transfer.h ssluse.h url.h getinfo.h \

  hash.h llist.h transfer.h ssluse.h url.h getinfo.h share.h \

  ../include/curl/mprintf.h

escape.o: escape.c setup.h config.h config.dj ../include/curl/curl.h \

  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h
@@ -78,29 +84,40 @@ getinfo.o: getinfo.c setup.h config.h config.dj ../include/curl/curl.h \ 
  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \

  urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \

  llist.h

getpass.o: getpass.c setup.h config.h config.dj

hash.o: hash.c setup.h config.h config.dj hash.h llist.h

hostip.o: hostip.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h sendf.h share.h ../include/curl/mprintf.h

  hash.h llist.h sendf.h share.h url.h ../include/curl/mprintf.h

http.o: http.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h transfer.h sendf.h progress.h base64.h strequal.h \

  ssluse.h ../include/curl/mprintf.h

  ssluse.h http_digest.h http_ntlm.h http_negotiate.h url.h share.h \

  http.h ../include/curl/mprintf.h

http_chu.o: http_chu.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h sendf.h content_encoding.h ../include/curl/mprintf.h

http_dig.o: http_dig.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h sendf.h strequal.h md5.h http_digest.h \

  ../include/curl/mprintf.h

http_neg.o: http_neg.c setup.h config.h config.dj

http_ntl.o: http_ntl.c setup.h config.h config.dj

if2ip.o: if2ip.c setup.h config.h config.dj

krb4.o: krb4.c setup.h config.h config.dj

md5.o: md5.c setup.h config.h config.dj

ldap.o: ldap.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h sendf.h escape.h transfer.h ../include/curl/mprintf.h

llist.o: llist.c setup.h config.h config.dj llist.h

memdebug.o: memdebug.c

memdebug.o: memdebug.c setup.h config.h config.dj ../include/curl/curl.h \

  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \

  ../include/curl/mprintf.h urldata.h cookie.h formdata.h timeval.h \

  http_chunks.h hostip.h hash.h llist.h

mprintf.o: mprintf.c setup.h config.h config.dj

multi.o: multi.c setup.h config.h config.dj ../include/curl/curl.h \

  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \
@@ -108,7 +125,7 @@ multi.o: multi.c setup.h config.h config.dj ../include/curl/curl.h \ 
  llist.h transfer.h url.h connect.h progress.h

netrc.o: netrc.c setup.h config.h config.dj ../include/curl/curl.h \

  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \

  strequal.h strtok.h

  strequal.h strtok.h ../include/curl/mprintf.h

progress.o: progress.c setup.h config.h config.dj ../include/curl/curl.h \

  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \

  urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \
@@ -129,7 +146,7 @@ speedche.o: speedche.c setup.h config.h config.dj ../include/curl/curl.h \ 
ssluse.o: ssluse.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h sendf.h url.h

  hash.h llist.h sendf.h url.h inet_pton.h

strequal.o: strequal.c setup.h config.h config.dj

strtok.o: strtok.c setup.h config.h config.dj

telnet.o: telnet.c setup.h config.h config.dj urldata.h cookie.h \
@@ -142,15 +159,16 @@ transfer.o: transfer.c setup.h config.h config.dj strequal.h urldata.h \ 
  cookie.h ../include/curl/curl.h ../include/curl/types.h \

  ../include/curl/easy.h ../include/curl/multi.h formdata.h timeval.h \

  http_chunks.h hostip.h hash.h llist.h netrc.h content_encoding.h \

  transfer.h sendf.h speedcheck.h getpass.h progress.h getdate.h http.h \

  url.h getinfo.h ssluse.h ../include/curl/mprintf.h

  transfer.h sendf.h speedcheck.h progress.h getdate.h http.h url.h \

  getinfo.h ssluse.h http_digest.h http_ntlm.h http_negotiate.h share.h \

  ../include/curl/mprintf.h

url.o: url.c setup.h config.h config.dj urldata.h cookie.h \

  ../include/curl/curl.h ../include/curl/types.h ../include/curl/easy.h \

  ../include/curl/multi.h formdata.h timeval.h http_chunks.h hostip.h \

  hash.h llist.h netrc.h base64.h ssluse.h if2ip.h transfer.h sendf.h \

  getpass.h progress.h strequal.h escape.h strtok.h share.h \

  content_encoding.h ftp.h dict.h telnet.h http.h file.h ldap.h url.h \

  connect.h ca-bundle.h ../include/curl/mprintf.h

  progress.h strequal.h escape.h strtok.h share.h content_encoding.h \

  http_digest.h http_negotiate.h ftp.h dict.h telnet.h http.h file.h \

  ldap.h url.h connect.h ca-bundle.h ../include/curl/mprintf.h

version.o: version.c setup.h config.h config.dj ../include/curl/curl.h \

  ../include/curl/types.h ../include/curl/easy.h ../include/curl/multi.h \

  urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h \