diff options
55 files changed, 108 insertions, 106 deletions
@@ -11,6 +11,8 @@ Yang Tse (21 Apr 2009) setup_once.h. Inclusion of each header file is based on the definition of NEED_MALLOC_H and NEED_MEMORY_H respectively. + Renamed libcurl's memory.h to curl_memory.h + Daniel Stenberg (20 Apr 2009) - Leanic Lefever reported a crash and did some detailed research on why and how it occurs (http://curl.haxx.se/mail/lib-2009-04/0289.html). The diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index bcbbfa93a..965da47b5 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -154,7 +154,7 @@ $(OBJ_DIR)\file.obj: file.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h & progress.h sendf.h escape.h file.h speedcheck.h getinfo.h transfer.h & - url.h memory.h parsedate.h ..\include\curl\mprintf.h memdebug.h + url.h curl_memory.h parsedate.h ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\timeval.obj: timeval.c timeval.h setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h $(OBJ_DIR)\base64.obj: base64.c setup.h config-win32.h ..\include\curl\curlbuild.h & @@ -163,14 +163,14 @@ $(OBJ_DIR)\base64.obj: base64.c setup.h config-win32.h ..\include\curl\curlbuild ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h urldata.h cookie.h ..\include\curl\curl.h & formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h & - curl_addrinfo.h splay.h easyif.h curl_base64.h memory.h memdebug.h + curl_addrinfo.h splay.h easyif.h curl_base64.h curl_memory.h memdebug.h $(OBJ_DIR)\hostip.obj: hostip.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.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 formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & - share.h strerror.h url.h inet_ntop.h ..\include\curl\mprintf.h memory.h & + share.h strerror.h url.h inet_ntop.h ..\include\curl\mprintf.h curl_memory.h & memdebug.h $(OBJ_DIR)\progress.obj: progress.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & @@ -184,7 +184,7 @@ $(OBJ_DIR)\formdata.obj: formdata.c setup.h config-win32.h ..\include\curl\curlb ..\include\curl\curlver.h ..\include\curl\curlrules.h & ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h & urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h & - llist.h curl_addrinfo.h splay.h easyif.h strequal.h memory.h & + llist.h curl_addrinfo.h splay.h easyif.h strequal.h curl_memory.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\cookie.obj: cookie.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h ..\include\curl\mprintf.h & @@ -192,7 +192,7 @@ $(OBJ_DIR)\cookie.obj: cookie.c setup.h config-win32.h ..\include\curl\curlbuild ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h urldata.h cookie.h ..\include\curl\curl.h & formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h & - curl_addrinfo.h splay.h strequal.h strtok.h sendf.h memory.h share.h & + curl_addrinfo.h splay.h strequal.h strtok.h sendf.h curl_memory.h share.h & strtoofft.h rawstr.h memdebug.h $(OBJ_DIR)\http.obj: http.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & @@ -202,7 +202,7 @@ $(OBJ_DIR)\http.obj: http.c setup.h config-win32.h ..\include\curl\curlbuild.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h & transfer.h sendf.h easyif.h progress.h curl_base64.h strequal.h & sslgen.h http_digest.h http_ntlm.h http_negotiate.h url.h share.h & - http.h memory.h select.h parsedate.h strtoofft.h multiif.h rawstr.h & + http.h curl_memory.h select.h parsedate.h strtoofft.h multiif.h rawstr.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\sendf.obj: sendf.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h ..\include\curl\curl.h & @@ -210,7 +210,7 @@ $(OBJ_DIR)\sendf.obj: sendf.c setup.h config-win32.h ..\include\curl\curlbuild.h ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h & urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h & llist.h curl_addrinfo.h splay.h sendf.h connect.h sslgen.h ssh.h & - multiif.h ..\include\curl\mprintf.h memory.h strerror.h easyif.h & + multiif.h ..\include\curl\mprintf.h curl_memory.h strerror.h easyif.h & memdebug.h $(OBJ_DIR)\ftp.obj: ftp.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h ..\include\curl\curl.h & @@ -221,7 +221,7 @@ $(OBJ_DIR)\ftp.obj: ftp.c setup.h config-win32.h ..\include\curl\curlbuild.h & transfer.h escape.h http.h socks.h ftp.h strtoofft.h strequal.h & sslgen.h connect.h strerror.h inet_ntop.h inet_pton.h select.h & parsedate.h sockaddr.h multiif.h url.h ..\include\curl\mprintf.h & - memory.h memdebug.h + curl_memory.h memdebug.h $(OBJ_DIR)\url.obj: url.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & ..\include\curl\curl.h ..\include\curl\curlver.h & @@ -232,7 +232,7 @@ $(OBJ_DIR)\url.obj: url.c setup.h config-win32.h ..\include\curl\curlbuild.h & strtok.h share.h content_encoding.h http_digest.h http_negotiate.h & select.h multiif.h easyif.h speedcheck.h rawstr.h ftp.h dict.h telnet.h & tftp.h http.h file.h curl_ldap.h ssh.h url.h connect.h inet_ntop.h & - http_ntlm.h socks.h ..\include\curl\mprintf.h memory.h memdebug.h + http_ntlm.h socks.h ..\include\curl\mprintf.h curl_memory.h memdebug.h $(OBJ_DIR)\dict.obj: dict.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & ..\include\curl\curl.h ..\include\curl\curlver.h & @@ -246,7 +246,7 @@ $(OBJ_DIR)\if2ip.obj: if2ip.c setup.h config-win32.h ..\include\curl\curlbuild.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 if2ip.h & - ..\include\curl\mprintf.h memory.h memdebug.h + ..\include\curl\mprintf.h curl_memory.h memdebug.h $(OBJ_DIR)\speedcheck.obj: speedcheck.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h & ..\include\curl\curl.h ..\include\curl\curlver.h & @@ -274,19 +274,19 @@ $(OBJ_DIR)\getenv.obj: getenv.c setup.h config-win32.h ..\include\curl\curlbuild ..\include\curl\curlrules.h 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 & - memory.h memdebug.h + curl_memory.h memdebug.h $(OBJ_DIR)\escape.obj: escape.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h 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 & - memory.h urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h & + curl_memory.h urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h & hash.h llist.h curl_addrinfo.h splay.h easyif.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\mprintf.obj: mprintf.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h ..\include\curl\mprintf.h & ..\include\curl\curl.h ..\include\curl\curlver.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & - ..\include\curl\multi.h memory.h ..\include\curl\curl.h memdebug.h + ..\include\curl\multi.h curl_memory.h ..\include\curl\curl.h memdebug.h $(OBJ_DIR)\telnet.obj: telnet.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & ..\include\curl\curl.h ..\include\curl\curlver.h & @@ -294,19 +294,19 @@ $(OBJ_DIR)\telnet.obj: telnet.c setup.h config-win32.h ..\include\curl\curlbuild ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h & transfer.h sendf.h telnet.h connect.h ..\include\curl\mprintf.h & - arpa_telnet.h memory.h select.h strequal.h rawstr.h memdebug.h + arpa_telnet.h curl_memory.h select.h strequal.h rawstr.h memdebug.h $(OBJ_DIR)\netrc.obj: netrc.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h 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 & - netrc.h strequal.h strtok.h memory.h rawstr.h ..\include\curl\mprintf.h & + netrc.h strequal.h strtok.h curl_memory.h rawstr.h ..\include\curl\mprintf.h & memdebug.h $(OBJ_DIR)\getinfo.obj: getinfo.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h 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 & urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h & - llist.h curl_addrinfo.h splay.h getinfo.h memory.h sslgen.h connect.h & + llist.h curl_addrinfo.h splay.h getinfo.h curl_memory.h sslgen.h connect.h & memdebug.h $(OBJ_DIR)\transfer.obj: transfer.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h strtoofft.h strequal.h & @@ -316,7 +316,7 @@ $(OBJ_DIR)\transfer.obj: transfer.c setup.h config-win32.h ..\include\curl\curlb cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h & curl_addrinfo.h splay.h netrc.h content_encoding.h transfer.h sendf.h & speedcheck.h progress.h http.h url.h getinfo.h sslgen.h http_digest.h & - http_ntlm.h http_negotiate.h share.h memory.h select.h multiif.h & + http_ntlm.h http_negotiate.h share.h curl_memory.h select.h multiif.h & easyif.h ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\strequal.obj: strequal.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h strequal.h & @@ -330,7 +330,7 @@ $(OBJ_DIR)\easy.obj: easy.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\multi.h ..\include\curl\curl.h urldata.h cookie.h & formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h & curl_addrinfo.h splay.h transfer.h sslgen.h url.h getinfo.h share.h & - strdup.h memory.h progress.h easyif.h select.h sendf.h http_ntlm.h & + strdup.h curl_memory.h progress.h easyif.h select.h sendf.h http_ntlm.h & connect.h ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\security.obj: security.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h @@ -343,7 +343,7 @@ $(OBJ_DIR)\memdebug.obj: memdebug.c setup.h config-win32.h ..\include\curl\curlb ..\include\curl\curlver.h ..\include\curl\curlrules.h & ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h & ..\include\curl\mprintf.h urldata.h cookie.h formdata.h timeval.h & - http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h memory.h & + http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h curl_memory.h & memdebug.h $(OBJ_DIR)\http_chunks.obj: http_chunks.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h & @@ -351,7 +351,7 @@ $(OBJ_DIR)\http_chunks.obj: http_chunks.c setup.h config-win32.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & - content_encoding.h http.h memory.h easyif.h ..\include\curl\mprintf.h & + content_encoding.h http.h curl_memory.h easyif.h ..\include\curl\mprintf.h & memdebug.h $(OBJ_DIR)\strtok.obj: strtok.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h strtok.h @@ -361,10 +361,10 @@ $(OBJ_DIR)\connect.obj: connect.c setup.h config-win32.h ..\include\curl\curlbui ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h urldata.h cookie.h ..\include\curl\curl.h & formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h & - curl_addrinfo.h splay.h sendf.h if2ip.h strerror.h connect.h memory.h & + curl_addrinfo.h splay.h sendf.h if2ip.h strerror.h connect.h curl_memory.h & select.h url.h multiif.h sockaddr.h inet_ntop.h sslgen.h memdebug.h $(OBJ_DIR)\llist.obj: llist.c setup.h config-win32.h ..\include\curl\curlbuild.h & - ..\include\curl\curlrules.h setup_once.h llist.h memory.h & + ..\include\curl\curlrules.h setup_once.h llist.h curl_memory.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 memdebug.h @@ -372,7 +372,7 @@ $(OBJ_DIR)\hash.obj: hash.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h hash.h llist.h & ..\include\curl\mprintf.h ..\include\curl\curl.h & ..\include\curl\curlver.h ..\include\curl\curlrules.h & - ..\include\curl\easy.h ..\include\curl\multi.h memory.h & + ..\include\curl\easy.h ..\include\curl\multi.h curl_memory.h & ..\include\curl\curl.h memdebug.h $(OBJ_DIR)\multi.obj: multi.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h ..\include\curl\curl.h & @@ -380,7 +380,7 @@ $(OBJ_DIR)\multi.obj: multi.c setup.h config-win32.h ..\include\curl\curlbuild.h ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h & urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h & llist.h curl_addrinfo.h splay.h transfer.h url.h connect.h progress.h & - easyif.h multiif.h sendf.h http.h ..\include\curl\mprintf.h memory.h & + easyif.h multiif.h sendf.h http.h ..\include\curl\mprintf.h curl_memory.h & memdebug.h $(OBJ_DIR)\content_encoding.obj: content_encoding.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h @@ -389,14 +389,14 @@ $(OBJ_DIR)\share.obj: share.c setup.h config-win32.h ..\include\curl\curlbuild.h ..\include\curl\curlver.h ..\include\curl\curlrules.h & ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h & urldata.h cookie.h formdata.h timeval.h http_chunks.h hostip.h hash.h & - llist.h curl_addrinfo.h splay.h share.h memory.h memdebug.h + llist.h curl_addrinfo.h splay.h share.h curl_memory.h memdebug.h $(OBJ_DIR)\http_digest.obj: http_digest.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h & urldata.h cookie.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 formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & - rawstr.h curl_base64.h curl_md5.h http_digest.h strtok.h url.h memory.h & + rawstr.h curl_base64.h curl_md5.h http_digest.h strtok.h url.h curl_memory.h & easyif.h ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\md5.obj: md5.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h curl_md5.h @@ -408,7 +408,7 @@ $(OBJ_DIR)\http_ntlm.obj: http_ntlm.c setup.h config-win32.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h easyif.h & - sendf.h rawstr.h curl_base64.h http_ntlm.h url.h memory.h ssluse.h & + sendf.h rawstr.h curl_base64.h http_ntlm.h url.h curl_memory.h ssluse.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\inet_pton.obj: inet_pton.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h & @@ -430,21 +430,21 @@ $(OBJ_DIR)\hostares.obj: hostares.c setup.h config-win32.h ..\include\curl\curlb ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & share.h strerror.h url.h multiif.h inet_pton.h connect.h select.h & - ..\include\curl\mprintf.h memory.h memdebug.h + ..\include\curl\mprintf.h curl_memory.h memdebug.h $(OBJ_DIR)\hostasyn.obj: hostasyn.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.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 formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & - share.h strerror.h url.h ..\include\curl\mprintf.h memory.h memdebug.h + share.h strerror.h url.h ..\include\curl\mprintf.h curl_memory.h memdebug.h $(OBJ_DIR)\hostip4.obj: hostip4.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.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 formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & - share.h strerror.h url.h inet_pton.h ..\include\curl\mprintf.h memory.h & + share.h strerror.h url.h inet_pton.h ..\include\curl\mprintf.h curl_memory.h & memdebug.h $(OBJ_DIR)\hostip6.obj: hostip6.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & @@ -453,14 +453,14 @@ $(OBJ_DIR)\hostip6.obj: hostip6.c setup.h config-win32.h ..\include\curl\curlbui ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & share.h strerror.h url.h inet_pton.h connect.h & - ..\include\curl\mprintf.h memory.h memdebug.h + ..\include\curl\mprintf.h curl_memory.h memdebug.h $(OBJ_DIR)\hostsyn.obj: hostsyn.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.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 formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & - share.h strerror.h url.h ..\include\curl\mprintf.h memory.h memdebug.h + share.h strerror.h url.h ..\include\curl\mprintf.h curl_memory.h memdebug.h $(OBJ_DIR)\hostthre.obj: hostthre.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & ..\include\curl\curl.h ..\include\curl\curlver.h & @@ -468,7 +468,7 @@ $(OBJ_DIR)\hostthre.obj: hostthre.c setup.h config-win32.h ..\include\curl\curlb ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sendf.h & share.h strerror.h url.h multiif.h inet_pton.h & - ..\include\curl\mprintf.h inet_ntop.h memory.h memdebug.h + ..\include\curl\mprintf.h inet_ntop.h curl_memory.h memdebug.h $(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h & ..\include\curl\mprintf.h ..\include\curl\curl.h & @@ -493,7 +493,7 @@ $(OBJ_DIR)\sslgen.obj: sslgen.c setup.h config-win32.h ..\include\curl\curlbuild ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h sslgen.h & - ssluse.h gtls.h nssg.h qssl.h sendf.h rawstr.h url.h memory.h & + ssluse.h gtls.h nssg.h qssl.h sendf.h rawstr.h url.h curl_memory.h & progress.h memdebug.h $(OBJ_DIR)\tftp.obj: tftp.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & @@ -502,7 +502,7 @@ $(OBJ_DIR)\tftp.obj: tftp.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h curl_addrinfo.h splay.h & transfer.h sendf.h tftp.h progress.h connect.h strerror.h sockaddr.h & - url.h ..\include\curl\mprintf.h memory.h select.h memdebug.h + url.h ..\include\curl\mprintf.h curl_memory.h select.h memdebug.h $(OBJ_DIR)\splay.obj: splay.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h splay.h $(OBJ_DIR)\strdup.obj: strdup.c setup.h config-win32.h ..\include\curl\curlbuild.h & @@ -535,4 +535,4 @@ $(OBJ_DIR)\curl_addrinfo.obj: curl_addrinfo.c setup.h config-win32.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 curl_addrinfo.h & - ..\include\curl\mprintf.h memory.h memdebug.h + ..\include\curl\mprintf.h curl_memory.h memdebug.h diff --git a/lib/Makefile.inc b/lib/Makefile.inc index e4e631d0b..412f5dece 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -18,7 +18,7 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ getinfo.h strequal.h krb4.h memdebug.h http_chunks.h \ strtok.h connect.h llist.h hash.h content_encoding.h share.h \ curl_md5.h http_digest.h http_negotiate.h http_ntlm.h inet_pton.h \ - strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h \ + strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h \ transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \ tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \ curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h diff --git a/lib/base64.c b/lib/base64.c index 02fd60aa7..4cc7ae9f6 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -43,7 +43,7 @@ #include "urldata.h" /* for the SessionHandle definition */ #include "easyif.h" /* for Curl_convert_... prototypes */ #include "curl_base64.h" -#include "memory.h" +#include "curl_memory.h" /* include memdebug.h last */ #include "memdebug.h" diff --git a/lib/connect.c b/lib/connect.c index ba337bc79..c1206cee5 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -81,7 +81,7 @@ #include "if2ip.h" #include "strerror.h" #include "connect.h" -#include "memory.h" +#include "curl_memory.h" #include "select.h" #include "url.h" /* for Curl_safefree() */ #include "multiif.h" diff --git a/lib/content_encoding.c b/lib/content_encoding.c index 9163f0bab..411f21337 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -32,7 +32,7 @@ #include <curl/curl.h> #include "sendf.h" #include "content_encoding.h" -#include "memory.h" +#include "curl_memory.h" #include "memdebug.h" diff --git a/lib/cookie.c b/lib/cookie.c index bc2f09b22..6a8813062 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -93,7 +93,7 @@ Example set of cookies: #include "strequal.h" #include "strtok.h" #include "sendf.h" -#include "memory.h" +#include "curl_memory.h" #include "share.h" #include "strtoofft.h" #include "rawstr.h" diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index f88ea2a93..8c85f8865 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -54,7 +54,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/memory.h b/lib/curl_memory.h index 076d20a28..a96132a8f 100644 --- a/lib/memory.h +++ b/lib/curl_memory.h @@ -1,5 +1,5 @@ -#ifndef _CURL_MEMORY_H -#define _CURL_MEMORY_H +#ifndef HEADER_CURL_MEMORY_H +#define HEADER_CURL_MEMORY_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -47,4 +47,4 @@ extern curl_calloc_callback Curl_ccalloc; #endif -#endif /* _CURL_MEMORY_H */ +#endif /* HEADER_CURL_MEMORY_H */ diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index 47e7d5e23..d91948557 100644 --- a/lib/curl_sspi.c +++ b/lib/curl_sspi.c @@ -32,7 +32,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/easy.c b/lib/easy.c index 15558594d..9fa55f3c4 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -77,7 +77,7 @@ #include "hostip.h" #include "share.h" #include "strdup.h" -#include "memory.h" +#include "curl_memory.h" #include "progress.h" #include "easyif.h" #include "select.h" diff --git a/lib/escape.c b/lib/escape.c index 626581819..838100e38 100644 --- a/lib/escape.c +++ b/lib/escape.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -31,7 +31,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "memory.h" +#include "curl_memory.h" /* urldata.h and easyif.h are included for Curl_convert_... prototypes */ #include "urldata.h" #include "easyif.h" diff --git a/lib/file.c b/lib/file.c index 9aae1e4df..7e55bd6db 100644 --- a/lib/file.c +++ b/lib/file.c @@ -82,7 +82,7 @@ #include "getinfo.h" #include "transfer.h" #include "url.h" -#include "memory.h" +#include "curl_memory.h" #include "parsedate.h" /* for the week day and month names */ #define _MPRINTF_REPLACE /* use our functions only */ diff --git a/lib/formdata.c b/lib/formdata.c index 10f2caeac..aa644ecb2 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -122,7 +122,7 @@ Content-Disposition: form-data; name="FILECONTENT" #include "easyif.h" /* for Curl_convert_... prototypes */ #include "formdata.h" #include "strequal.h" -#include "memory.h" +#include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -94,7 +94,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/getenv.c b/lib/getenv.c index 21cc42f34..73fece24d 100644 --- a/lib/getenv.c +++ b/lib/getenv.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -32,7 +32,7 @@ #endif #include <curl/curl.h> -#include "memory.h" +#include "curl_memory.h" #include "memdebug.h" diff --git a/lib/getinfo.c b/lib/getinfo.c index 4aa813797..be88f5091 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -32,7 +32,7 @@ #include <string.h> #include <stdarg.h> #include <stdlib.h> -#include "memory.h" +#include "curl_memory.h" #include "sslgen.h" #include "connect.h" /* Curl_getconnectinfo() */ #include "progress.h" diff --git a/lib/gtls.c b/lib/gtls.c index 8bf754b92..70b1b2510 100644 --- a/lib/gtls.c +++ b/lib/gtls.c @@ -54,7 +54,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hash.c b/lib/hash.c index 7757d8b64..fed7b9841 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -32,7 +32,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hostares.c b/lib/hostares.c index 1998357a3..1412f13a6 100644 --- a/lib/hostares.c +++ b/lib/hostares.c @@ -76,7 +76,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hostasyn.c b/lib/hostasyn.c index 211ff7234..8659e2fb2 100644 --- a/lib/hostasyn.c +++ b/lib/hostasyn.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -64,7 +64,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hostip.c b/lib/hostip.c index 47d90aba9..9f6069bff 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -72,7 +72,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hostip4.c b/lib/hostip4.c index 168405c19..847b77a18 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -66,7 +66,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hostip6.c b/lib/hostip6.c index e63e80670..972f84778 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -66,7 +66,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hostsyn.c b/lib/hostsyn.c index d0d1ce4aa..027d5fa1a 100644 --- a/lib/hostsyn.c +++ b/lib/hostsyn.c @@ -64,7 +64,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/hostthre.c b/lib/hostthre.c index e3958626b..688006d2b 100644 --- a/lib/hostthre.c +++ b/lib/hostthre.c @@ -74,7 +74,7 @@ #include "inet_ntop.h" -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/http.c b/lib/http.c index dfd19dd86..2e3798f65 100644 --- a/lib/http.c +++ b/lib/http.c @@ -91,7 +91,7 @@ #include "share.h" #include "hostip.h" #include "http.h" -#include "memory.h" +#include "curl_memory.h" #include "select.h" #include "parsedate.h" /* for the week day and month names */ #include "strtoofft.h" diff --git a/lib/http_chunks.c b/lib/http_chunks.c index 630a5a265..13ef3cff6 100644 --- a/lib/http_chunks.c +++ b/lib/http_chunks.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -35,7 +35,7 @@ #include "content_encoding.h" #include "http.h" -#include "memory.h" +#include "curl_memory.h" #include "easyif.h" /* for Curl_convert_to_network prototype */ #define _MPRINTF_REPLACE /* use our functions only */ diff --git a/lib/http_digest.c b/lib/http_digest.c index ea2aebf01..b370891b7 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -38,7 +38,7 @@ #include "http_digest.h" #include "strtok.h" #include "url.h" /* for Curl_safefree() */ -#include "memory.h" +#include "curl_memory.h" #include "easyif.h" /* included for Curl_convert_... prototypes */ #define _MPRINTF_REPLACE /* use our functions only */ diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index 814d6ed65..515a3a3b3 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -40,7 +40,7 @@ #include "rawstr.h" #include "curl_base64.h" #include "http_negotiate.h" -#include "memory.h" +#include "curl_memory.h" #ifdef HAVE_SPNEGO # include <spnegohelp.h> diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c index e1141f310..0154ecebd 100644 --- a/lib/http_ntlm.c +++ b/lib/http_ntlm.c @@ -59,7 +59,7 @@ #include "curl_base64.h" #include "http_ntlm.h" #include "url.h" -#include "memory.h" +#include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> diff --git a/lib/if2ip.c b/lib/if2ip.c index f43658902..f0159457c 100644 --- a/lib/if2ip.c +++ b/lib/if2ip.c @@ -64,7 +64,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/krb4.c b/lib/krb4.c index ba471f55b..c58e94730 100644 --- a/lib/krb4.c +++ b/lib/krb4.c @@ -7,7 +7,7 @@ * * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). - * Copyright (c) 2004 - 2008 Daniel Stenberg + * Copyright (c) 2004 - 2009 Daniel Stenberg * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,7 +63,7 @@ #include "sendf.h" #include "krb4.h" #include "inet_ntop.h" -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/krb5.c b/lib/krb5.c index ab25718e1..d64161df0 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -2,7 +2,7 @@ * * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). - * Copyright (c) 2004 - 2008 Daniel Stenberg + * Copyright (c) 2004 - 2009 Daniel Stenberg * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -61,7 +61,7 @@ #include "ftp.h" #include "sendf.h" #include "krb4.h" -#include "memory.h" +#include "curl_memory.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> diff --git a/lib/ldap.c b/lib/ldap.c index d396d7103..8bf74448d 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -70,7 +70,7 @@ #include "strequal.h" #include "strtok.h" #include "curl_ldap.h" -#include "memory.h" +#include "curl_memory.h" #include "curl_base64.h" #include "rawstr.h" diff --git a/lib/llist.c b/lib/llist.c index 4a41b80c1..a262fee29 100644 --- a/lib/llist.c +++ b/lib/llist.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -27,7 +27,7 @@ #include <stdlib.h> #include "llist.h" -#include "memory.h" +#include "curl_memory.h" /* this must be the last include file */ #include "memdebug.h" diff --git a/lib/memdebug.c b/lib/memdebug.c index aa85b8a40..3c74df025 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -42,7 +42,7 @@ #endif #define MEMDEBUG_NODEFINES /* don't redefine the standard functions */ -#include "memory.h" +#include "curl_memory.h" #include "memdebug.h" struct memdebug { diff --git a/lib/mprintf.c b/lib/mprintf.c index a09450306..ceafb5197 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1999 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1999 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -49,7 +49,7 @@ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/multi.c b/lib/multi.c index 2ce023331..95d386f85 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -46,7 +46,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/netrc.c b/lib/netrc.c index 4fefefc6e..c82b639c9 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -42,7 +42,7 @@ #include "strequal.h" #include "strtok.h" -#include "memory.h" +#include "curl_memory.h" #include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ @@ -64,7 +64,7 @@ #include <secport.h> #include <certdb.h> -#include "memory.h" +#include "curl_memory.h" #include "rawstr.h" #include "easyif.h" /* for Curl_convert_from_utf8 prototype */ diff --git a/lib/qssl.c b/lib/qssl.c index a855f4a0c..5ef8037db 100644 --- a/lib/qssl.c +++ b/lib/qssl.c @@ -38,7 +38,7 @@ #include "sslgen.h" #include "connect.h" /* for the connect timeout */ #include "select.h" -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/security.c b/lib/security.c index 7f6f3da0a..17ac3686d 100644 --- a/lib/security.c +++ b/lib/security.c @@ -10,7 +10,7 @@ * Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * - * Copyright (C) 2001 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2001 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * All rights reserved. * @@ -65,7 +65,7 @@ #include "curl_base64.h" #include "sendf.h" #include "ftp.h" -#include "memory.h" +#include "curl_memory.h" #include "rawstr.h" /* The last #include file should be: */ diff --git a/lib/sendf.c b/lib/sendf.c index e622b9ac6..0db35783e 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -56,7 +56,7 @@ #endif #include <string.h> -#include "memory.h" +#include "curl_memory.h" #include "strerror.h" #include "easyif.h" /* for the Curl_convert_from_network prototype */ /* The last #include file should be: */ diff --git a/lib/share.c b/lib/share.c index 382e4b3d0..9eb8b99b9 100644 --- a/lib/share.c +++ b/lib/share.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -28,7 +28,7 @@ #include <curl/curl.h> #include "urldata.h" #include "share.h" -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/slist.c b/lib/slist.c index 638a67018..90b82f2cc 100644 --- a/lib/slist.c +++ b/lib/slist.c @@ -28,7 +28,7 @@ #include <stdlib.h> #include <string.h> -#include "memory.h" +#include "curl_memory.h" #include "slist.h" /* The last #include file should be: */ @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -106,7 +106,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/sslgen.c b/lib/sslgen.c index 57ce31284..8325dccf0 100644 --- a/lib/sslgen.c +++ b/lib/sslgen.c @@ -59,7 +59,7 @@ #include "sendf.h" #include "rawstr.h" #include "url.h" -#include "memory.h" +#include "curl_memory.h" #include "progress.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/ssluse.c b/lib/ssluse.c index 821ec420c..2e6928d77 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -68,7 +68,7 @@ #include <x509v3.h> #endif -#include "memory.h" +#include "curl_memory.h" #include "easyif.h" /* for Curl_convert_from_utf8 prototype */ /* The last #include file should be: */ diff --git a/lib/telnet.c b/lib/telnet.c index 69d42bd7f..f2af18311 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -76,7 +76,7 @@ #define TELCMDS #include "arpa_telnet.h" -#include "memory.h" +#include "curl_memory.h" #include "select.h" #include "strequal.h" #include "rawstr.h" diff --git a/lib/tftp.c b/lib/tftp.c index 67ec5576d..509c2ccae 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -76,7 +76,7 @@ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" #include "select.h" /* The last #include file should be: */ diff --git a/lib/transfer.c b/lib/transfer.c index 6b9e310a0..0056792e7 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -99,7 +99,7 @@ #include "http_ntlm.h" #include "http_negotiate.h" #include "share.h" -#include "memory.h" +#include "curl_memory.h" #include "select.h" #include "multiif.h" #include "easyif.h" /* for Curl_convert_to_network prototype */ @@ -135,7 +135,7 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> -#include "memory.h" +#include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c index eebf6dfa5..253e043e1 100644 --- a/tests/libtest/lib558.c +++ b/tests/libtest/lib558.c @@ -29,7 +29,7 @@ #include "hash.h" #include "hostip.h" -#include "memory.h" +#include "curl_memory.h" #include "memdebug.h" /* This source file is used for test # 558 and 559 */ diff --git a/tests/server/getpart.c b/tests/server/getpart.c index 448cdc143..d946e0f7b 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -34,7 +34,7 @@ struct SessionHandle { }; #include "curl_base64.h" -#include "memory.h" +#include "curl_memory.h" /* include memdebug.h last */ #include "memdebug.h" |