From 9770899a4bfb27ea73d0b0ee4be857ea1e47c4fd Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 21 Apr 2009 10:26:58 +0000 Subject: Moved potential inclusion of system's malloc.h and memory.h header files to setup_once.h. Inclusion of each header file is based on the definition of NEED_MALLOC_H and NEED_MEMORY_H respectively. --- lib/curl_addrinfo.c | 3 --- lib/hostares.c | 3 --- lib/hostasyn.c | 3 --- lib/hostip.c | 5 +---- lib/hostip4.c | 5 +---- lib/hostip6.c | 5 +---- lib/hostsyn.c | 5 +---- lib/hostthre.c | 5 +---- lib/ldap.c | 3 --- lib/memdebug.h | 5 +---- lib/setup_once.h | 10 +++++++++- lib/socks.c | 3 --- lib/socks_gssapi.c | 3 --- lib/socks_sspi.c | 3 --- 14 files changed, 15 insertions(+), 46 deletions(-) (limited to 'lib') diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index d5a6bc712..f88ea2a93 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -25,9 +25,6 @@ #include -#ifdef NEED_MALLOC_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif diff --git a/lib/hostares.c b/lib/hostares.c index 1198ac7d9..1998357a3 100644 --- a/lib/hostares.c +++ b/lib/hostares.c @@ -28,9 +28,6 @@ #ifdef HAVE_LIMITS_H #include #endif -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/hostasyn.c b/lib/hostasyn.c index 802698af0..211ff7234 100644 --- a/lib/hostasyn.c +++ b/lib/hostasyn.c @@ -25,9 +25,6 @@ #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/hostip.c b/lib/hostip.c index b4eb3583a..47d90aba9 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -25,9 +25,6 @@ #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/hostip4.c b/lib/hostip4.c index f7100417e..168405c19 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , 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,9 +26,6 @@ #include #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/hostip6.c b/lib/hostip6.c index 833e50b93..e63e80670 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -25,9 +25,6 @@ #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/hostsyn.c b/lib/hostsyn.c index 0c09f7094..d0d1ce4aa 100644 --- a/lib/hostsyn.c +++ b/lib/hostsyn.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -25,9 +25,6 @@ #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/hostthre.c b/lib/hostthre.c index 3aa1ccbce..e3958626b 100644 --- a/lib/hostthre.c +++ b/lib/hostthre.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , 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,9 +26,6 @@ #include #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/ldap.c b/lib/ldap.c index 908ffc580..d396d7103 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -30,9 +30,6 @@ #include #include #include -#ifdef NEED_MALLOC_H -#include -#endif #include #ifdef CURL_LDAP_HYBRID /* If W$ definitions are needed. */ diff --git a/lib/memdebug.h b/lib/memdebug.h index 3ed911635..4c84247b1 100644 --- a/lib/memdebug.h +++ b/lib/memdebug.h @@ -8,7 +8,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -41,9 +41,6 @@ #include #endif #include -#ifdef HAVE_MEMORY_H -#include -#endif #define logfile curl_debuglogfile diff --git a/lib/setup_once.h b/lib/setup_once.h index 90c5de14f..c1c899631 100644 --- a/lib/setup_once.h +++ b/lib/setup_once.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, , 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,6 +49,14 @@ #include #endif +#ifdef NEED_MALLOC_H +#include +#endif + +#ifdef NEED_MEMORY_H +#include +#endif + #ifdef HAVE_SYS_STAT_H #include #endif diff --git a/lib/socks.c b/lib/socks.c index edf9c5553..826e1383a 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -26,9 +26,6 @@ #if !defined(CURL_DISABLE_PROXY) || defined(USE_WINDOWS_SSPI) #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_STDLIB_H #include #endif diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c index d948168d4..8b5ccf714 100644 --- a/lib/socks_gssapi.c +++ b/lib/socks_gssapi.c @@ -34,9 +34,6 @@ #endif #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_STDLIB_H #include #endif diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c index 9798e8944..6feb422b9 100644 --- a/lib/socks_sspi.c +++ b/lib/socks_sspi.c @@ -28,9 +28,6 @@ #include -#ifdef NEED_MALLOC_H -#include -#endif #ifdef HAVE_STDLIB_H #include #endif -- cgit v1.2.3