in the Watcom makefiles aren't quite correct).
Changelog
+Daniel Fandrich (15 Jul 2009)
+- Added nonblock.c to the non-automake makefiles (note that the dependencies
+ in the Watcom makefiles aren't quite correct).
+
Michal Marek (15 Jul 2009)
- Changed the description of CURLINFO_OS_ERRNO to make it clear that the
errno is not reset on success.
$(OBJ_DIR)\telnet.obj $(OBJ_DIR)\tftp.obj &
$(OBJ_DIR)\timeval.obj $(OBJ_DIR)\transfer.obj &
$(OBJ_DIR)\url.obj $(OBJ_DIR)\version.obj &
- $(OBJ_DIR)\slist.obj
+ $(OBJ_DIR)\slist.obj $(OBJ_DIR)\nonblock.obj
#
# Use $(OBJS) as a template to generate $(OBJS_STAT) and $(OBJS_DYN).
url.h connect.h strequal.h select.h sslgen.h ..\include\curl\mprintf.h
$(OBJ_DIR)\qssl.obj: qssl.c setup.h config-win32.h ..\include\curl\curlbuild.h &
..\include\curl\curlrules.h setup_once.h
+$(OBJ_DIR)\nonblock.obj: nonblock.c setup.h config-win32.h ..\include\curl\curlbuild.h &
+ ..\include\curl\curlrules.h setup_once.h nonblock.h &
+ ..\include\curl\curl.h ..\include\curl\curlver.h &
+ ..\include\curl\curlrules.h ..\include\curl\easy.h &
+ ..\include\curl\multi.h ..\include\curl\curl.h
$(OBJ_DIR)\rawstr.obj: rawstr.c setup.h config-win32.h ..\include\curl\curlbuild.h &
..\include\curl\curlrules.h setup_once.h rawstr.h &
..\include\curl\curl.h ..\include\curl\curlver.h &
o.security o.select o.sendf o.speedcheck o.ssluse \
o.strequal o.strtok o.telnet o.timeval \
o.transfer o.url o.version o.strtoofft o.sslgen o.gtls \
- o.rawstr o.curl_addrinfo o.slist
+ o.rawstr o.curl_addrinfo o.slist o.nonblock
# Compile options:
linkopts = -o libcurl
o.ssluse: c.ssluse
gcc $(compileropts) -c -o ssluse.o c.ssluse
+o.nonblock: c.nonblock
+ gcc $(compileropts) -c -o nonblock.o c.nonblock
+
o.rawstr: c.rawstr
gcc $(compileropts) -c -o rawstr.o c.rawstr
progress.c security.c select.c sendf.c share.c speedcheck.c ssluse.c \
strequal.c strtok.c telnet.c timeval.c transfer.c url.c version.c \
sslgen.c gtls.c strerror.c rawstr.c curl_addrinfo.c \
- socks_gssapi.c socks_sspi.c curl_sspi.c slist.c
+ socks_gssapi.c socks_sspi.c curl_sspi.c slist.c nonblock.c
all: $(OBJS:.c=.o)
ar cru libcurl.a $(OBJS:.c=.o)
SOURCEPATH ../../../lib
SOURCE \
- rawstr.c
+ rawstr.c nonblock.c
USERINCLUDE ../../../src ../../../lib ../../../include/curl
hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \
inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \
strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c \
- socks_gssapi.c socks_sspi.c curl_sspi.c slist.c
+ socks_gssapi.c socks_sspi.c curl_sspi.c slist.c nonblock.c
USERINCLUDE ../../../lib ../../../include/curl
#ifdef ENABLE_SSL
C_SRC += mprintf.c
C_SRC += multi.c
C_SRC += netrc.c
+C_SRC += nonblock.c
C_SRC += nss.c
C_SRC += parsedate.c
C_SRC += progress.c
$(OBJ_DIR)\rawstr.obj: ..\lib\rawstr.c
$(CC) $[@ $(CFLAGS) -fo=$@
+.ERASE
+$(OBJ_DIR)\nonblock.obj: ..\lib\nonblock.c
+ $(CC) $[@ $(CFLAGS) -fo=$@
+
#
# Dependencies based on "gcc -MM .."
#
..\lib\strerror.h ..\lib\urldata.h ..\lib\cookie.h ..\lib\formdata.h &
..\lib\timeval.h ..\lib\http_chunks.h ..\lib\hostip.h ..\lib\hash.h &
..\lib\llist.h ..\lib\splay.h ..\include\curl\mprintf.h
+
+$(OBJ_DIR)\nonblock.obj: ..\lib\nonblock.c ..\lib\setup.h ..\lib\config-win32.h &
+ ..\include\curl\curlbuild.h ..\include\curl\curlrules.h ..\lib\setup_once.h &
+ ..\include\curl\curl.h ..\include\curl\curlver.h ..\include\curl\curlrules.h &
+ ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
+ ..\lib\strerror.h ..\lib\urldata.h ..\lib\cookie.h ..\lib\formdata.h &
+ ..\lib\timeval.h ..\lib\http_chunks.h ..\lib\hostip.h ..\lib\hash.h &
+ ..\lib\llist.h ..\lib\splay.h ..\include\curl\mprintf.h ..\lib\nonblock.h
# Contact: easygcc@melotech.co.uk
# Project objects:
-objs = o.hugehelp o.main o.urlglob o.writeout o.writeenv o.rawstr
+objs = o.hugehelp o.main o.urlglob o.writeout o.writeenv o.rawstr o.nonblock
# Compile options:
o.rawstr: ../lib/c.rawstr
gcc $(compileropts) -c -o rawstr.o ../lib/c.rawstr
+o.nonblock: ../lib/c.nonblock
+ gcc $(compileropts) -c -o nonblock.o ../lib/c.nonblock
+
# Dynamic dependancies:
o.hugehelp: c.hugehelp
homedirr.obj \\r
curlutilr.obj \\r
os-specificr.obj \\r
+ nonblockr.obj \\r
rawstrr.obj \\r
strtoofftr.obj \\r
mainr.obj \\r
homedird.obj \\r
curlutild.obj \\r
os-specificd.obj \\r
+ nonblockd.obj \\r
rawstrd.obj \\r
strtoofftd.obj \\r
maind.obj \\r
$(CCR) $(CFLAGS) /Fo"$@" curlutil.c\r
os-specificr.obj: os-specific.c\r
$(CCR) $(CFLAGS) /Fo"$@" os-specific.c\r
+nonblockr.obj: ../lib/nonblock.c\r
+ $(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
rawstrr.obj: ../lib/rawstr.c\r
$(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
strtoofftr.obj: ../lib/strtoofft.c\r
$(CCD) $(CFLAGS) /Fo"$@" curlutil.c\r
os-specificd.obj: os-specific.c\r
$(CCD) $(CFLAGS) /Fo"$@" os-specific.c\r
+nonblockd.obj: ../lib/nonblock.c\r
+ $(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
rawstrd.obj: ../lib/rawstr.c\r
$(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c\r
strtoofftd.obj: ../lib/strtoofft.c\r
README = ../docs/MANUAL
MKHELP = ../src/mkhelp.pl
-OBJS = getpass.c hugehelp.c main.c urlglob.c writeenv.c writeout.c curlutil.c os-specific.c ../lib/rawstr.c
+OBJS = getpass.c hugehelp.c main.c urlglob.c writeenv.c writeout.c curlutil.c os-specific.c ../lib/rawstr.c ../lib/nonblock.c
all: hugehelp.c $(OBJS:.c=.o)
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\lib\nonblock.c\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\lib\rawstr.c\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\lib\nonblock.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\lib\rawstr.h\r
# End Source File\r
# Begin Source File\r