mirror of
https://github.com/moparisthebest/curl
synced 2025-02-28 17:31:46 -05:00
unit tests: adjust header inclusion order
Additionally, prevent multiple inclusions of curl_config.h
This commit is contained in:
parent
3f6ffcd26d
commit
02f3ff3b0a
@ -19,12 +19,9 @@
|
|||||||
* KIND, either express or implied.
|
* KIND, either express or implied.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include <stdlib.h>
|
#include "curlcheck.h"
|
||||||
#include "curl_config.h"
|
|
||||||
#include "setup.h"
|
|
||||||
|
|
||||||
#include "llist.h"
|
#include "llist.h"
|
||||||
#include "curlcheck.h"
|
|
||||||
|
|
||||||
struct curl_llist *llist;
|
struct curl_llist *llist;
|
||||||
|
|
||||||
|
@ -19,12 +19,9 @@
|
|||||||
* KIND, either express or implied.
|
* KIND, either express or implied.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include <stdlib.h>
|
#include "curlcheck.h"
|
||||||
#include "curl_config.h"
|
|
||||||
#include "setup.h"
|
|
||||||
|
|
||||||
#include "strequal.h"
|
#include "strequal.h"
|
||||||
#include "curlcheck.h"
|
|
||||||
|
|
||||||
static CURLcode unit_setup( void ) {return CURLE_OK;}
|
static CURLcode unit_setup( void ) {return CURLE_OK;}
|
||||||
static void unit_stop( void ) {}
|
static void unit_stop( void ) {}
|
||||||
|
@ -19,14 +19,11 @@
|
|||||||
* KIND, either express or implied.
|
* KIND, either express or implied.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include <stdlib.h>
|
#include "curlcheck.h"
|
||||||
#include "curl_config.h"
|
|
||||||
#include "setup.h"
|
|
||||||
|
|
||||||
#include "urldata.h"
|
#include "urldata.h"
|
||||||
#include "url.h" /* for Curl_safefree */
|
#include "url.h" /* for Curl_safefree */
|
||||||
#include "curl_base64.h"
|
#include "curl_base64.h"
|
||||||
#include "curlcheck.h"
|
|
||||||
#include "memdebug.h" /* LAST include file */
|
#include "memdebug.h" /* LAST include file */
|
||||||
|
|
||||||
static struct SessionHandle *data;
|
static struct SessionHandle *data;
|
||||||
|
@ -19,13 +19,10 @@
|
|||||||
* KIND, either express or implied.
|
* KIND, either express or implied.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include <stdlib.h>
|
#include "curlcheck.h"
|
||||||
#include "curl_config.h"
|
|
||||||
#include "setup.h"
|
|
||||||
|
|
||||||
#include "urldata.h"
|
#include "urldata.h"
|
||||||
#include "connect.h"
|
#include "connect.h"
|
||||||
#include "curlcheck.h"
|
|
||||||
#include "memdebug.h" /* LAST include file */
|
#include "memdebug.h" /* LAST include file */
|
||||||
|
|
||||||
static struct SessionHandle *data;
|
static struct SessionHandle *data;
|
||||||
|
@ -19,12 +19,9 @@
|
|||||||
* KIND, either express or implied.
|
* KIND, either express or implied.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include <stdlib.h>
|
#include "curlcheck.h"
|
||||||
#include "curl_config.h"
|
|
||||||
#include "setup.h"
|
|
||||||
|
|
||||||
#include "netrc.h"
|
#include "netrc.h"
|
||||||
#include "curlcheck.h"
|
|
||||||
|
|
||||||
char login[LOGINSIZE];
|
char login[LOGINSIZE];
|
||||||
char password[PASSWORDSIZE];
|
char password[PASSWORDSIZE];
|
||||||
|
@ -19,11 +19,8 @@
|
|||||||
* KIND, either express or implied.
|
* KIND, either express or implied.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include "test.h"
|
#include "curlcheck.h"
|
||||||
|
|
||||||
#ifdef HAVE_SYS_SOCKET_H
|
|
||||||
# include <sys/socket.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_NETINET_IN_H
|
#ifdef HAVE_NETINET_IN_H
|
||||||
# include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
@ -39,7 +36,6 @@
|
|||||||
|
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "hostip.h"
|
#include "hostip.h"
|
||||||
#include "curlcheck.h"
|
|
||||||
|
|
||||||
#include "curl_memory.h"
|
#include "curl_memory.h"
|
||||||
#include "memdebug.h" /* LAST include file */
|
#include "memdebug.h" /* LAST include file */
|
||||||
|
@ -19,9 +19,10 @@
|
|||||||
* KIND, either express or implied.
|
* KIND, either express or implied.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
#include "curl_fnmatch.h"
|
|
||||||
#include "curlcheck.h"
|
#include "curlcheck.h"
|
||||||
|
|
||||||
|
#include "curl_fnmatch.h"
|
||||||
|
|
||||||
#define MATCH CURL_FNMATCH_MATCH
|
#define MATCH CURL_FNMATCH_MATCH
|
||||||
#define NOMATCH CURL_FNMATCH_NOMATCH
|
#define NOMATCH CURL_FNMATCH_NOMATCH
|
||||||
#define RE_ERR CURL_FNMATCH_FAIL
|
#define RE_ERR CURL_FNMATCH_FAIL
|
||||||
|
Loading…
x
Reference in New Issue
Block a user