curl_memory: make curl_memory.h the second-last header file loaded

This header file must be included after all header files except
memdebug.h, as it does similar memory function redefinitions and can be
similarly affected by conflicting definitions in system or dependent
library headers.

diff --git a/lib/base64.c b/lib/base64.c
index 1defca19efb677c6c2605bf7f09959fc975242d4..6b87eed40015ddbc496b166408ace5d9780479f4 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -27,10 +27,10 @@
 #include "urldata.h" /* for the SessionHandle definition */
 #include "warnless.h"
 #include "curl_base64.h"
-#include "curl_memory.h"
 #include "non-ascii.h"
 
-/* include memdebug.h last */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* ---- Base64 Encoding/Decoding Table --- */

diff --git a/lib/connect.c b/lib/connect.c
index 68317d98683ce012571c77a3229a965d97ab8be8..1781e4b52f7d2a9d9330c630ded6ac444823e884 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -62,7 +62,6 @@
 #include "if2ip.h"
 #include "strerror.h"
 #include "connect.h"
-#include "curl_memory.h"
 #include "select.h"
 #include "url.h" /* for Curl_safefree() */
 #include "multiif.h"
@@ -75,7 +74,8 @@
 #include "conncache.h"
 #include "multihandle.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #ifdef __SYMBIAN32__

diff --git a/lib/cookie.c b/lib/cookie.c
index ddf6f72b18e9e605859b6074b47c15e686dfddaf..f1450e9051ba65b9f26aee0d9371055bb5b5d313 100644 (file)
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -91,14 +91,14 @@ Example set of cookies:
 #include "strtok.h"
 #include "sendf.h"
 #include "slist.h"
-#include "curl_memory.h"
 #include "share.h"
 #include "strtoofft.h"
 #include "rawstr.h"
 #include "curl_memrchr.h"
 #include "inet_pton.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 static void freecookie(struct Cookie *co)

diff --git a/lib/curl_memory.h b/lib/curl_memory.h
index e3cdc721c43685532b4983b88b2b437ee1568643..bc744ccd84dd0c265354ebbbea5aadd522a8af07 100644 (file)
--- a/lib/curl_memory.h
+++ b/lib/curl_memory.h
@@ -28,6 +28,9 @@
  * File curl_memory.h must be included by _all_ *.c source files
  * that use memory related functions strdup, malloc, calloc, realloc
  * or free, and given source file is used to build libcurl library.
+ * It should be included immediately before memdebug.h as the last files
+ * included to avoid undesired interaction with other memory function
+ * headers in dependent libraries.
  *
  * There is nearly no exception to above rule. All libcurl source
  * files in 'lib' subdirectory as well as those living deep inside

diff --git a/lib/curl_ntlm.c b/lib/curl_ntlm.c
index 1bc509d7e1f0dfe49dc29f363a05629c133890b6..1f3bdccdfa06b19f02f3615834a340a9835635fa 100644 (file)
--- a/lib/curl_ntlm.c
+++ b/lib/curl_ntlm.c
@@ -41,7 +41,6 @@
 #include "curl_ntlm_wb.h"
 #include "curl_sasl.h"
 #include "url.h"
-#include "curl_memory.h"
 #include "curl_printf.h"
 
 #if defined(USE_NSS)
@@ -50,7 +49,8 @@
 #include "curl_sspi.h"
 #endif
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #if DEBUG_ME

diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index a77f42da0dabd31a0b47b15ee456a1701fdb1cbb..2e5b573fd3a8a3756c99b6a606945023e823bc10 100644 (file)
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -101,7 +101,6 @@
 #include "urldata.h"
 #include "non-ascii.h"
 #include "rawstr.h"
-#include "curl_memory.h"
 #include "curl_ntlm_core.h"
 #include "curl_md5.h"
 #include "curl_hmac.h"
@@ -110,7 +109,8 @@
 #include "curl_des.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #define NTLM_HMAC_MD5_LEN     (16)

diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index 3161b3888c1027cb900a514eb269b126720c1790..b5f3935d88636122a2eb8cff4b844137d81590a3 100644 (file)
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -41,7 +41,6 @@
 #include "curl_gethostname.h"
 #include "curl_multibyte.h"
 #include "warnless.h"
-#include "curl_memory.h"
 
 #include "vtls/vtls.h"
 
@@ -55,7 +54,8 @@
 #include "curl_endian.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* "NTLMSSP" signature is always in ASCII regardless of the platform */

diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c
index 53681a0d59e2a0e921e008d09ba38801043eab33..d63fb277b69937f047f36d9e9b5743e1994cab20 100644 (file)
--- a/lib/curl_ntlm_wb.c
+++ b/lib/curl_ntlm_wb.c
@@ -51,10 +51,10 @@
 #include "curl_ntlm_wb.h"
 #include "url.h"
 #include "strerror.h"
-#include "curl_memory.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #if DEBUG_ME

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index f192fddac7e650dc1fcf801699ccde3c784b0d3b..d9f63ab0b4b747eae09ae44b05403484404c873b 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -39,7 +39,6 @@
 #include "curl_hmac.h"
 #include "curl_sasl.h"
 #include "warnless.h"
-#include "curl_memory.h"
 #include "strtok.h"
 #include "strequal.h"
 #include "rawstr.h"
@@ -47,7 +46,8 @@
 #include "non-ascii.h" /* included for Curl_convert_... prototypes */
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* Supported mechanisms */

diff --git a/lib/curl_sasl_gssapi.c b/lib/curl_sasl_gssapi.c
index 81d241bb04edad3b8e85b25a0d0a90bd452972c8..3c6f3ce32166fbf877b917d669b1787974e99831 100644 (file)
--- a/lib/curl_sasl_gssapi.c
+++ b/lib/curl_sasl_gssapi.c
@@ -33,11 +33,11 @@
 #include "urldata.h"
 #include "curl_base64.h"
 #include "curl_gssapi.h"
-#include "curl_memory.h"
 #include "sendf.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /*

diff --git a/lib/curl_sasl_sspi.c b/lib/curl_sasl_sspi.c
index 238d74b7e92c449a95c13c7c791f15aa2071cba0..0a332e60b7822444d16b8276a053550066e98a56 100644 (file)
--- a/lib/curl_sasl_sspi.c
+++ b/lib/curl_sasl_sspi.c
@@ -36,13 +36,13 @@
 #include "urldata.h"
 #include "curl_base64.h"
 #include "warnless.h"
-#include "curl_memory.h"
 #include "curl_multibyte.h"
 #include "sendf.h"
 #include "strdup.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /*

diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index 401c5b4083ec56d6490780af2c93ca4114f44769..43fcb637d47c0e732c3b69d71303ddf65e32d968 100644 (file)
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -26,11 +26,11 @@
 
 #include <curl/curl.h>
 #include "curl_sspi.h"
-#include "curl_memory.h"
 #include "curl_multibyte.h"
 #include "warnless.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* We use our own typedef here since some headers might lack these */

diff --git a/lib/easy.c b/lib/easy.c
index f094fc099fe7481537133bbaaf1462286e0bda28..316acb1d18681bda33b9543c94b98f9c8c53086d 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -60,7 +60,6 @@
 #include "hostip.h"
 #include "share.h"
 #include "strdup.h"
-#include "curl_memory.h"
 #include "progress.h"
 #include "easyif.h"
 #include "select.h"
@@ -77,7 +76,8 @@
 #include "ssh.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* win32_cleanup() is for win32 socket cleanup functionality, the opposite

diff --git a/lib/escape.c b/lib/escape.c
index 814e5b72f6c4c48838f6944b336be8c856c9b4ba..24abb930be1b4a5bc06f40b562208f194bbd7db4 100644 (file)
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -27,14 +27,14 @@
 
 #include <curl/curl.h>
 
-#include "curl_memory.h"
 #include "urldata.h"
 #include "warnless.h"
 #include "non-ascii.h"
 #include "escape.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* Portable character check (remember EBCDIC). Do not use isalnum() because

diff --git a/lib/file.c b/lib/file.c
index 14e765f5e86f5f01c8ee079619eff3b3a231e4e7..324d4e290288d1e078260f0f362d7da735316e36 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -59,12 +59,12 @@
 #include "getinfo.h"
 #include "transfer.h"
 #include "url.h"
-#include "curl_memory.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "warnless.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || \

diff --git a/lib/formdata.c b/lib/formdata.c
index 7299aa1237968deaa0d549c0e9f7f8c941f9b25a..cd98f3c6f55ba80964325cc19954f1afff37d181 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -34,12 +34,12 @@
 #include "formdata.h"
 #include "vtls/vtls.h"
 #include "strequal.h"
-#include "curl_memory.h"
 #include "sendf.h"
 #include "strdup.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #ifndef HAVE_BASENAME

diff --git a/lib/getinfo.c b/lib/getinfo.c
index 9ece7760ce336589406a2fd69259036d37242d53..910f520edc52c8aa4fb630421bcc10ccb551363a 100644 (file)
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -27,12 +27,12 @@
 #include "urldata.h"
 #include "getinfo.h"
 
-#include "curl_memory.h"
 #include "vtls/vtls.h"
 #include "connect.h" /* Curl_getconnectinfo() */
 #include "progress.h"
 
-/* Make this the last #include */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /*

diff --git a/lib/http.c b/lib/http.c
index c79526ee04436cd33b983ac7ec4cce3f45ecfee1..efd6b524b9831dad21ca5f2ac544e4fb1da32bbf 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -63,7 +63,6 @@
 #include "share.h"
 #include "hostip.h"
 #include "http.h"
-#include "curl_memory.h"
 #include "select.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "strtoofft.h"
@@ -79,7 +78,8 @@
 #include "connect.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /*

diff --git a/lib/http2.c b/lib/http2.c
index f6dbd80691d52c97d0c18a38bd6d8415a1da8640..658d6141eaf895ba3b8b8597611a7a8126fae2ff 100644 (file)
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -30,11 +30,11 @@
 #include "http.h"
 #include "sendf.h"
 #include "curl_base64.h"
-#include "curl_memory.h"
 #include "rawstr.h"
 #include "multiif.h"
 
-/* include memdebug.h last */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #if (NGHTTP2_VERSION_NUM < 0x000600)

diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 0b1a5ed379d1098877a9889d7e3e7f51c620a815..80c0f9548685643bccbba84529411bb6fb9e4d4d 100644 (file)
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -29,12 +29,12 @@
 
 #include "content_encoding.h"
 #include "http.h"
-#include "curl_memory.h"
 #include "non-ascii.h" /* for Curl_convert_to_network prototype */
 #include "strtoofft.h"
 #include "warnless.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /*

diff --git a/lib/http_digest.c b/lib/http_digest.c
index 33d79ab5ad668b29c7ded911e460ed6c22f8b5d0..929e2c60f3b4f2bd77c0de13ba2e851aa2c527f7 100644 (file)
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -28,10 +28,10 @@
 #include "rawstr.h"
 #include "curl_sasl.h"
 #include "http_digest.h"
-#include "curl_memory.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* Test example headers:

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 1c840fe0363fdb8339f60a48e70de857dd18d1e2..21658cf7ac3e96649082b99c98a07a2bd6924aa3 100644 (file)
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -30,12 +30,12 @@
 #include "rawstr.h"
 #include "curl_base64.h"
 #include "http_negotiate.h"
-#include "curl_memory.h"
 #include "curl_sasl.h"
 #include "url.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy,

diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c
index d3c028c17dd932b18768f6f5ea38983ff322ad34..20f8d643c7967850973c3763c573157a2bbbfc66 100644 (file)
--- a/lib/http_negotiate_sspi.c
+++ b/lib/http_negotiate_sspi.c
@@ -33,11 +33,11 @@
 #include "curl_base64.h"
 #include "curl_sasl.h"
 #include "http_negotiate.h"
-#include "curl_memory.h"
 #include "curl_multibyte.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy,

diff --git a/lib/krb5.c b/lib/krb5.c
index 60bc6a5e93d11878f5e8a02b09a5aaac4a6ba96d..ad7dd67afaf18911211c2ea557cbcbe1c79cc304 100644 (file)
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -46,11 +46,11 @@
 #include "curl_gssapi.h"
 #include "sendf.h"
 #include "curl_sec.h"
-#include "curl_memory.h"
 #include "warnless.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #define LOCAL_ADDR (&conn->local_addr)

diff --git a/lib/ldap.c b/lib/ldap.c
index 9e71185d4994960d2816f3821185fbaefa5a5092..4d91282260e89003863f276f219d8f3d8c5be016 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -72,12 +72,14 @@
 #include "strequal.h"
 #include "strtok.h"
 #include "curl_ldap.h"
-#include "curl_memory.h"
 #include "curl_multibyte.h"
 #include "curl_base64.h"
 #include "rawstr.h"
 #include "connect.h"
 #include "curl_printf.h"
+
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #ifndef HAVE_LDAP_URL_PARSE

diff --git a/lib/md5.c b/lib/md5.c
index 774d6b02a32cd004ab28cf962368b4d610b50668..b604c109fa7c23aa0ea061d1ad117ee497122350 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -28,11 +28,10 @@
 #include "curl_hmac.h"
 #include "warnless.h"
 
-#include "curl_memory.h"
-
 #if defined(USE_GNUTLS_NETTLE)
 
 #include <nettle/md5.h>
+#include "curl_memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
 
@@ -58,6 +57,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx)
 #elif defined(USE_GNUTLS)
 
 #include <gcrypt.h>
+#include "curl_memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
 
@@ -84,6 +84,9 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx)
 #elif defined(USE_OPENSSL)
 /* When OpenSSL is available we use the MD5-function from OpenSSL */
 #include <openssl/md5.h>
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
 
 #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \
               (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \
@@ -98,6 +101,9 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX * ctx)
    reliable than defining COMMON_DIGEST_FOR_OPENSSL on older cats. */
 #  include <CommonCrypto/CommonDigest.h>
 #  define MD5_CTX CC_MD5_CTX
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
 
 static void MD5_Init(MD5_CTX *ctx)
 {
@@ -119,6 +125,9 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx)
 #elif defined(_WIN32)
 
 #include <wincrypt.h>
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
 
 typedef struct {
   HCRYPTPROV hCryptProv;
@@ -156,6 +165,9 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx)
 #include <axTLS/config.h>
 #include <axTLS/os_int.h>
 #include <axTLS/crypto.h>
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
 #else
 /* When no other crypto library is available we use this code segment */
 /*
@@ -197,6 +209,10 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx)
 
 #include <string.h>
 
+/* The last #include files should be: */
+#include "curl_memory.h"
+#include "memdebug.h"
+
 /* Any 32-bit or wider unsigned integer data type will do */
 typedef unsigned int MD5_u32plus;
 
@@ -465,9 +481,6 @@ static void MD5_Final(unsigned char *result, MD5_CTX *ctx)
 
 #endif /* CRYPTO LIBS */
 
-/* The last #include file should be: */
-#include "memdebug.h"
-
 const HMAC_params Curl_HMAC_MD5[] = {
   {
     (HMAC_hinit_func) MD5_Init,           /* Hash initialization function. */

diff --git a/lib/netrc.c b/lib/netrc.c
index dbe79d3ddb203f3046e492b22a5d0846d37025d2..6271a3a2fe00a8af6f5da0e19dc9594c459b889e 100644 (file)
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -31,11 +31,11 @@
 
 #include "strequal.h"
 #include "strtok.h"
-#include "curl_memory.h"
 #include "rawstr.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* Get user and password from .netrc when given a machine name */

diff --git a/lib/openldap.c b/lib/openldap.c
index 40ad25560b0dad220cb21e2a3fc704016db207c0..bee552f333ac46062d7f3dc0996e1fba70f3923c 100644 (file)
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -44,10 +44,12 @@
 #include "vtls/vtls.h"
 #include "transfer.h"
 #include "curl_ldap.h"
-#include "curl_memory.h"
 #include "curl_base64.h"
 #include "connect.h"
 #include "curl_printf.h"
+
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #ifndef _LDAP_PVT_H

diff --git a/lib/rtsp.c b/lib/rtsp.c
index a1d1862d616e754741df469768a924ec664baa8f..b133e205ffd68db4c7325cf5bcd0f02e34569d60 100644 (file)
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -34,12 +34,12 @@
 #include "progress.h"
 #include "rtsp.h"
 #include "rawstr.h"
-#include "curl_memory.h"
 #include "select.h"
 #include "connect.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /*

diff --git a/lib/sendf.c b/lib/sendf.c
index 96899f466ad313cf775e06f31eee64ac0b4a4d6e..879e082921c520a8838985eb76fc9796a1398c9e 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -32,10 +32,10 @@
 #include "multiif.h"
 #include "non-ascii.h"
 #include "curl_printf.h"
-#include "curl_memory.h"
 #include "strerror.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #ifdef CURL_DO_LINEEND_CONV

diff --git a/lib/slist.c b/lib/slist.c
index 3cac6ca21c29714b3855bf46e2fa5554a322200a..9c0b2a58ad16694613413ed0fd2cdf1fe6fbb11c 100644 (file)
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -22,10 +22,10 @@
 
 #include "curl_setup.h"
 
-#include "curl_memory.h"
 #include "slist.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* returns last node in linked list */

diff --git a/lib/smb.c b/lib/smb.c
index cb4d997a6afa25480c1f6cc8466c19816d2157b4..8cb350359ca642a381529d1d6c2acc30b557f443 100644 (file)
--- a/lib/smb.c
+++ b/lib/smb.c
@@ -44,11 +44,11 @@
 #include "transfer.h"
 #include "vtls/vtls.h"
 #include "curl_ntlm_core.h"
-#include "curl_memory.h"
 #include "escape.h"
 #include "curl_endian.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* Local API functions */

diff --git a/lib/telnet.c b/lib/telnet.c
index fa2f657235b7f73b614f78c1f26c84f018bfe97a..91863c065ddc58510a764a6f9314b8a7cdf07298 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -57,13 +57,13 @@
 #define  TELCMDS
 
 #include "arpa_telnet.h"
-#include "curl_memory.h"
 #include "select.h"
 #include "strequal.h"
 #include "rawstr.h"
 #include "warnless.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #define SUBBUFSIZE 512

diff --git a/lib/tftp.c b/lib/tftp.c
index 56dabc6df410b63cf091db85951c7845b6b271c3..4c5796f55137103a019fe8c734245e27c003ade9 100644 (file)
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -58,10 +58,10 @@
 #include "rawstr.h"
 #include "speedcheck.h"
 #include "curl_printf.h"
-#include "curl_memory.h"
 #include "select.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* RFC2348 allows the block size to be negotiated */

diff --git a/lib/transfer.c b/lib/transfer.c
index c7938c0303f528b2dec102e4f8f2b1673fc857e0..ed358dca98501e32825e541ec75e1dd68ea4e797 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -75,14 +75,14 @@
 #include "curl_ntlm.h"
 #include "http_negotiate.h"
 #include "share.h"
-#include "curl_memory.h"
 #include "select.h"
 #include "multiif.h"
 #include "connect.h"
 #include "non-ascii.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /*

diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c
index 930136a232cc2aeff385347de1feb5e268ddf92c..08db9c568c0fff47c3f1c156e782bd27e6c3d418 100644 (file)
--- a/lib/vtls/axtls.c
+++ b/lib/vtls/axtls.c
@@ -40,11 +40,12 @@
 #include "connect.h" /* for the connect timeout */
 #include "select.h"
 #include "curl_printf.h"
-#include "curl_memory.h"
+#include "hostcheck.h"
 #include <unistd.h>
-/* The last #include file should be: */
+
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
-#include "hostcheck.h"
 
 
 /* Global axTLS init, called from Curl_ssl_init() */

diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c
index 00f2a05cb977fd94d7394902a36e14c4662c6cc6..d400b3f2ca8bb0f9e57be43cc86f86772d85616a 100644 (file)
--- a/lib/vtls/cyassl.c
+++ b/lib/vtls/cyassl.c
@@ -44,7 +44,6 @@
 #include "select.h"
 #include "rawstr.h"
 #include "curl_printf.h"
-#include "curl_memory.h"
 
 #include <cyassl/ssl.h>
 #include <cyassl/version.h>
@@ -55,7 +54,8 @@
 #endif
 #include <cyassl/ctaocrypt/random.h>
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 static Curl_recv cyassl_recv;

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index ec807c5c21ebc5ccb24b2e0a71111d5c46a719cb..feb00ca81d03dec2a143aacbafbbe541ae3294e2 100644 (file)
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -63,12 +63,12 @@
 #include <ocsp.h>
 #endif
 
-#include "curl_memory.h"
 #include "rawstr.h"
 #include "warnless.h"
 #include "x509asn1.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #define SSL_DIR "/etc/pki/nssdb"

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 56b5ff11257340f114d1b107e86c92f7d95841f3..7a5a7dc30045b86f47999c522da49378f71d567f 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -73,10 +73,10 @@
 #endif
 
 #include "warnless.h"
-#include "curl_memory.h"
 #include "non-ascii.h" /* for Curl_convert_from_utf8 prototype */
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 #ifndef OPENSSL_VERSION_NUMBER

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 4980d674fec460aae665fa17d94416ff5567d3ff..6973de42a153abda84e11e99230f09daf1d66d67 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -63,7 +63,6 @@
 #include "sendf.h"
 #include "rawstr.h"
 #include "url.h"
-#include "curl_memory.h"
 #include "progress.h"
 #include "share.h"
 #include "timeval.h"
@@ -72,7 +71,8 @@
 #include "curl_base64.h"
 #include "curl_printf.h"
 
-/* The last #include file should be: */
+/* The last #include files should be: */
+#include "curl_memory.h"
 #include "memdebug.h"
 
 /* convenience macro to check if this handle is using a shared SSL session */