Commit 4f45240b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

lib: include curl_printf.h as one of the last headers 

curl_printf.h defines printf to curl_mprintf, etc. This can cause
problems with external headers which may use
__attribute__((format(printf, ...))) markers etc.

To avoid that they cause problems with system includes, we include
curl_printf.h after any system headers. That makes the three last
headers to always be, and we keep them in this order:

 curl_printf.h
 curl_memory.h
 memdebug.h

None of them include system headers, they all do funny #defines.

Reported-by: David Benjamin

Fixes #743
parent 63b5378a

lib/asyn-ares.c

+3 −3
Original line number Diff line number Diff line
@@ -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
@@ -68,7 +68,6 @@ 
#include "connect.h"

#include "select.h"

#include "progress.h"

#include "curl_printf.h"



#  if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \

     (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__))
@@ -83,8 +82,9 @@ 
#define HAVE_CARES_CALLBACK_TIMEOUTS 1

#endif



/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_memory.h"

/* The last #include file should be: */

#include "memdebug.h"



struct ResolverResults {

lib/asyn-thread.c

+2 −3
Original line number Diff line number Diff line
@@ -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
@@ -69,10 +69,9 @@ 
#include "inet_ntop.h"

#include "curl_threads.h"

#include "connect.h"

/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_memory.h"



/* The last #include file should be: */

#include "memdebug.h"



/***********************************************************************

lib/base64.c

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 
/* Base64 encoding/decoding */



#include "curl_setup.h"

#include "curl_printf.h"

#include "urldata.h" /* for the SessionHandle definition */

#include "warnless.h"

#include "curl_base64.h"

#include "non-ascii.h"



/* The last #include files should be: */

/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_memory.h"

#include "memdebug.h"

lib/conncache.c

+2 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 2012, Linus Nielsen Feltzing, <linus@haxx.se>

 * Copyright (C) 2012, 2016, Linus Nielsen Feltzing, <linus@haxx.se>

 * Copyright (C) 2012 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which
@@ -32,10 +32,9 @@ 
#include "sendf.h"

#include "rawstr.h"

#include "conncache.h"

/* The last 3 #include files should be in this order */

#include "curl_printf.h"



#include "curl_memory.h"

/* The last #include file should be: */

#include "memdebug.h"



static void conn_llist_dtor(void *user, void *element)

lib/connect.c

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#include <inet.h>

#endif



#include "curl_printf.h"

#include "urldata.h"

#include "sendf.h"

#include "if2ip.h"
@@ -74,7 +73,8 @@ 
#include "conncache.h"

#include "multihandle.h"



/* The last #include files should be: */

/* The last 3 #include files should be in this order */

#include "curl_printf.h"

#include "curl_memory.h"

#include "memdebug.h"