Commit 4d3fb91f authored by Yang Tse's avatar Yang Tse
Browse files

test servers: build adjustment 

Undefine CURL_HIDDEN_SYMBOLS libcurl private preprocessor macro that might
leak from lib/setup.h into source files where this should not be defined.
parent bbfe1182

tests/server/Makefile.inc

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ CURLX_HDRS = \ 
USEFUL = \

 getpart.c \

 getpart.h \

 server_setup.h \

 $(top_srcdir)/lib/base64.c \

 $(top_srcdir)/lib/curl_base64.h \

 $(top_srcdir)/lib/memdebug.c \

tests/server/fake_ntlm.c

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

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

 *

 * Copyright (C) 1998 - 2010, Mandy Wu, <mandy.wu@intel.com>

 * Copyright (C) 2010, Mandy Wu, <mandy.wu@intel.com>

 * Copyright (C) 2011 - 2012, 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,6 +20,7 @@ 
 * KIND, either express or implied.

 *

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

#include "server_setup.h"



/*

 * This is a fake ntlm_auth, which is used for testing NTLM single-sign-on.
@@ -27,10 +29,6 @@ 
 * responses with a pre-written string saved in test case test2005.

 */



#define CURL_NO_OLDIES



#include "setup.h"



#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

tests/server/getpart.c

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

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

 *

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

 * Copyright (C) 1998 - 2012, 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,10 +19,7 @@ 
 * KIND, either express or implied.

 *

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



#define CURL_NO_OLDIES



#include "setup.h"

#include "server_setup.h"



#include "getpart.h"

tests/server/getpart.h

+5 −4
Original line number Diff line number Diff line 
#ifndef HEADER_SERVER_GETPART_H

#define HEADER_SERVER_GETPART_H

#ifndef HEADER_CURL_SERVER_GETPART_H

#define HEADER_CURL_SERVER_GETPART_H

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

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

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

 *

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

 * Copyright (C) 1998 - 2012, 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,7 @@ 
 * KIND, either express or implied.

 *

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

#include "server_setup.h"



#define GPE_NO_BUFFER_SPACE -2

#define GPE_OUT_OF_MEMORY   -1
@@ -30,4 +31,4 @@ 
int getpart(char **outbuf, size_t *outlen,

            const char *main, const char *sub, FILE *stream);



#endif /* HEADER_SERVER_GETPART_H */
 
#endif /* HEADER_CURL_SERVER_GETPART_H */

tests/server/resolve.c

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

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

 *

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

 * Copyright (C) 1998 - 2012, 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,6 +19,7 @@ 
 * KIND, either express or implied.

 *

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

#include "server_setup.h"



/* Purpose

 *
@@ -30,10 +31,6 @@ 
 *

 */



#define CURL_NO_OLDIES



#include "setup.h" /* portability help from the lib directory */



#ifdef HAVE_SIGNAL_H

#include <signal.h>

#endif