aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steven.holme@cubic.com>2016-04-01 13:21:12 +0100
committerSteve Holme <steven.holme@cubic.com>2016-04-01 13:21:12 +0100
commit0c331b899985cd9e805b60d2b68001dfdda11559 (patch)
tree362f9a1abec8814d94d7982aa89bd4e91eaf3ace
parent3e005a8555e8a82784b22dea50fbc7d0bb0ccd26 (diff)
downloadgnurl-0c331b899985cd9e805b60d2b68001dfdda11559.tar.gz
gnurl-0c331b899985cd9e805b60d2b68001dfdda11559.tar.bz2
gnurl-0c331b899985cd9e805b60d2b68001dfdda11559.zip
memdebug: Ensure curl/curl.h is included before curl_memory.h
Follow up to commit 7db9782dd6.
-rw-r--r--lib/curl_fnmatch.c4
-rw-r--r--lib/curl_memrchr.c5
-rw-r--r--lib/curl_threads.c4
-rw-r--r--lib/dotdot.c4
-rw-r--r--lib/hash.c5
-rw-r--r--lib/hmac.c5
-rw-r--r--lib/llist.c4
-rw-r--r--lib/md5.c4
-rw-r--r--lib/slist.c4
-rw-r--r--lib/strdup.c6
10 files changed, 35 insertions, 10 deletions
diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index 53240078a..e8108bb10 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -22,6 +22,8 @@
#include "curl_setup.h"
+#include <curl/curl.h>
+
#include "curl_fnmatch.h"
#include "curl_memory.h"
diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c
index 1be27e5c8..c521497b2 100644
--- a/lib/curl_memrchr.c
+++ b/lib/curl_memrchr.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -21,6 +21,9 @@
***************************************************************************/
#include "curl_setup.h"
+
+#include <curl/curl.h>
+
#include "curl_memrchr.h"
#include "curl_memory.h"
diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index 59d881143..c98d8bbad 100644
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -22,6 +22,8 @@
#include "curl_setup.h"
+#include <curl/curl.h>
+
#if defined(USE_THREADS_POSIX)
# ifdef HAVE_PTHREAD_H
# include <pthread.h>
diff --git a/lib/dotdot.c b/lib/dotdot.c
index 99fac7f98..ea7c8a04f 100644
--- a/lib/dotdot.c
+++ b/lib/dotdot.c
@@ -22,9 +22,11 @@
#include "curl_setup.h"
-#include "dotdot.h"
+#include <curl/curl.h>
+#include "dotdot.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 a0889783d..937381b65 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -22,9 +22,12 @@
#include "curl_setup.h"
+#include <curl/curl.h>
+
#include "hash.h"
#include "llist.h"
#include "curl_memory.h"
+
/* The last #include file should be: */
#include "memdebug.h"
diff --git a/lib/hmac.c b/lib/hmac.c
index 664c77418..3df471585 100644
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -26,8 +26,11 @@
#ifndef CURL_DISABLE_CRYPTO_AUTH
+#include <curl/curl.h>
+
#include "curl_hmac.h"
#include "curl_memory.h"
+
/* The last #include file should be: */
#include "memdebug.h"
diff --git a/lib/llist.c b/lib/llist.c
index 04b23e77c..482aaa041 100644
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -22,6 +22,8 @@
#include "curl_setup.h"
+#include <curl/curl.h>
+
#include "llist.h"
#include "curl_memory.h"
diff --git a/lib/md5.c b/lib/md5.c
index 6df07dc06..84adb9926 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -24,6 +24,8 @@
#ifndef CURL_DISABLE_CRYPTO_AUTH
+#include <curl/curl.h>
+
#include "curl_md5.h"
#include "curl_hmac.h"
#include "warnless.h"
diff --git a/lib/slist.c b/lib/slist.c
index 37ce97cbd..e5adc0e71 100644
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -22,6 +22,8 @@
#include "curl_setup.h"
+#include <curl/curl.h>
+
#include "slist.h"
/* The last #include files should be: */
diff --git a/lib/strdup.c b/lib/strdup.c
index 30a42f3d9..23f554e51 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, 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
@@ -19,7 +19,11 @@
* KIND, either express or implied.
*
***************************************************************************/
+
#include "curl_setup.h"
+
+#include <curl/curl.h>
+
#include "strdup.h"
#include "curl_memory.h"