generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test servers: build adjustment

Browse Source 
Undefine CURL_HIDDEN_SYMBOLS libcurl private preprocessor macro that might
leak from lib/setup.h into source files where this should not be defined.
This commit is contained in:
Yang Tse 2012-04-10 17:32:06 +02:00
parent bbfe118209
commit 4d3fb91fb4
15 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/server/Makefile.inc
View File

@ -19,6 +19,7 @@ CURLX_HDRS = \
USEFUL = \ USEFUL = \
getpart.c \ getpart.c \
getpart.h \ getpart.h \
server_setup.h \
$(top_srcdir)/lib/base64.c \ $(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/curl_base64.h \ $(top_srcdir)/lib/curl_base64.h \
$(top_srcdir)/lib/memdebug.c \ $(top_srcdir)/lib/memdebug.c \

8
tests/server/fake_ntlm.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -19,6 +20,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
/* /*
* This is a fake ntlm_auth, which is used for testing NTLM single-sign-on. * 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. * responses with a pre-written string saved in test case test2005.
*/ */
#define CURL_NO_OLDIES
#include "setup.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif

7
tests/server/getpart.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -19,10 +19,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
#define CURL_NO_OLDIES
#include "setup.h"
#include "getpart.h" #include "getpart.h"

9
tests/server/getpart.h
View File

@ -1,5 +1,5 @@
#ifndef HEADER_SERVER_GETPART_H #ifndef HEADER_CURL_SERVER_GETPART_H
#define HEADER_SERVER_GETPART_H #define HEADER_CURL_SERVER_GETPART_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * 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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -21,6 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
#define GPE_NO_BUFFER_SPACE -2 #define GPE_NO_BUFFER_SPACE -2
#define GPE_OUT_OF_MEMORY -1 #define GPE_OUT_OF_MEMORY -1
@ -30,4 +31,4 @@
int getpart(char **outbuf, size_t *outlen, int getpart(char **outbuf, size_t *outlen,
const char *main, const char *sub, FILE *stream); const char *main, const char *sub, FILE *stream);
#endif /* HEADER_SERVER_GETPART_H */ #endif /* HEADER_CURL_SERVER_GETPART_H */

7
tests/server/resolve.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -19,6 +19,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
/* Purpose /* Purpose
* *
@ -30,10 +31,6 @@
* *
*/ */
#define CURL_NO_OLDIES
#include "setup.h" /* portability help from the lib directory */
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif #endif

7
tests/server/rtspd.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -19,6 +19,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
/* /*
* curl's test suite Real Time Streaming Protocol (RTSP) server. * curl's test suite Real Time Streaming Protocol (RTSP) server.
@ -26,10 +27,6 @@
* This source file was started based on curl's HTTP test suite server. * This source file was started based on curl's HTTP test suite server.
*/ */
#define CURL_NO_OLDIES
#include "setup.h" /* portability help from the lib directory */
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif #endif

31
tests/server/server_setup.h Normal file
View File

@ -0,0 +1,31 @@
#ifndef HEADER_CURL_SERVER_SETUP_H
#define HEADER_CURL_SERVER_SETUP_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* 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
* are also available at http://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
***************************************************************************/
#define CURL_NO_OLDIES
#include "setup.h" /* portability help from the lib directory */
#undef CURL_HIDDEN_SYMBOLS /* libcurl internal use only */
#endif /* HEADER_CURL_SERVER_SETUP_H */

9
tests/server/server_sockaddr.h
View File

@ -1,5 +1,5 @@
#ifndef HEADER_SERVER_SOCKADDR_H #ifndef HEADER_CURL_SERVER_SOCKADDR_H
#define HEADER_SERVER_SOCKADDR_H #define HEADER_CURL_SERVER_SOCKADDR_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * 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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -21,6 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
typedef union { typedef union {
struct sockaddr sa; struct sockaddr sa;
@ -30,4 +31,4 @@ typedef union {
#endif #endif
} srvr_sockaddr_union_t; } srvr_sockaddr_union_t;
#endif /* HEADER_SERVER_SOCKADDR_H */ #endif /* HEADER_CURL_SERVER_SOCKADDR_H */

7
tests/server/sockfilt.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -19,6 +19,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
/* Purpose /* Purpose
* *
@ -79,10 +80,6 @@
* if no signal was being ignored or handled at all. Enjoy it! * if no signal was being ignored or handled at all. Enjoy it!
*/ */
#define CURL_NO_OLDIES
#include "setup.h" /* portability help from the lib directory */
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif #endif

5
tests/server/sws.c
View File

@ -19,6 +19,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
/* sws.c: simple (silly?) web server /* sws.c: simple (silly?) web server
@ -27,10 +28,6 @@
*/ */
#define CURL_NO_OLDIES
#include "setup.h" /* portability help from the lib directory */
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif #endif

7
tests/server/testpart.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -19,10 +19,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
#define CURL_NO_OLDIES
#include "setup.h"
#include "getpart.h" #include "getpart.h"

9
tests/server/tftp.h
View File

@ -1,5 +1,5 @@
#ifndef __SERVER_TFTP_H #ifndef HEADER_CURL_SERVER_TFTP_H
#define __SERVER_TFTP_H #define HEADER_CURL_SERVER_TFTP_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2008, 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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -21,6 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
/* This file is a rewrite/clone of the arpa/tftp.h file for systems without /* This file is a rewrite/clone of the arpa/tftp.h file for systems without
it. */ it. */
@ -54,4 +55,4 @@ struct tftphdr {
#define EEXISTS 6 #define EEXISTS 6
#define ENOUSER 7 #define ENOUSER 7
#endif /* __SERVER_TFTP_H */ #endif /* HEADER_CURL_SERVER_TFTP_H */

4
tests/server/tftpd.c
View File

@ -47,9 +47,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#define CURL_NO_OLDIES #include "server_setup.h"
#include "setup.h" /* portability help from the lib directory */
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>

5
tests/server/util.c
View File

@ -19,10 +19,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
#define CURL_NO_OLDIES
#include "setup.h" /* portability help from the lib directory */
#ifdef HAVE_SIGNAL_H #ifdef HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>

7
tests/server/util.h
View File

@ -1,5 +1,5 @@
#ifndef __SERVER_UTIL_H #ifndef HEADER_CURL_SERVER_UTIL_H
#define __SERVER_UTIL_H #define HEADER_CURL_SERVER_UTIL_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -21,6 +21,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
***************************************************************************/ ***************************************************************************/
#include "server_setup.h"
char *data_to_hex(char *data, size_t len); char *data_to_hex(char *data, size_t len);
void logmsg(const char *msg, ...); void logmsg(const char *msg, ...);
@ -62,4 +63,4 @@ void set_advisor_read_lock(const char *filename);
void clear_advisor_read_lock(const char *filename); void clear_advisor_read_lock(const char *filename);
#endif /* __SERVER_UTIL_H */ #endif /* HEADER_CURL_SERVER_UTIL_H */