From bbfe1182098b2451b1f457b37c2b53fe89e537e8 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 10 Apr 2012 17:29:37 +0200 Subject: [PATCH] libtests: 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. --- tests/libtest/chkhostname.c | 4 +++- tests/libtest/sethostname.c | 5 +++-- tests/libtest/test.h | 4 +++- tests/libtest/testutil.c | 5 +++-- tests/libtest/testutil.h | 10 +++++----- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c index 58930467f..bf0dbfda2 100644 --- a/tests/libtest/chkhostname.c +++ b/tests/libtest/chkhostname.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -21,6 +21,8 @@ ***************************************************************************/ #include "setup.h" +#undef CURL_HIDDEN_SYMBOLS /* libcurl internal use only */ + #include "curl_gethostname.h" #define HOSTNAME_MAX 1024 diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c index daf94f95c..d5d5cf9e2 100644 --- a/tests/libtest/sethostname.c +++ b/tests/libtest/sethostname.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -19,9 +19,10 @@ * KIND, either express or implied. * ***************************************************************************/ - #include "setup.h" +#undef CURL_HIDDEN_SYMBOLS /* libcurl internal use only */ + #include "sethostname.h" /* diff --git a/tests/libtest/test.h b/tests/libtest/test.h index 861a571a5..119debd68 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -29,6 +29,8 @@ #include "setup.h" +#undef CURL_HIDDEN_SYMBOLS /* libcurl internal use only */ + #include #include #include diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index 4ee488e71..fc79e5c63 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -19,9 +19,10 @@ * KIND, either express or implied. * ***************************************************************************/ - #include "setup.h" +#undef CURL_HIDDEN_SYMBOLS /* libcurl internal use only */ + #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h index 6a322e3cb..455b5d53f 100644 --- a/tests/libtest/testutil.h +++ b/tests/libtest/testutil.h @@ -1,5 +1,5 @@ -#ifndef __LIBTEST_TESTUTIL_H -#define __LIBTEST_TESTUTIL_H +#ifndef HEADER_CURL_LIBTEST_TESTUTIL_H +#define HEADER_CURL_LIBTEST_TESTUTIL_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -21,9 +21,9 @@ * KIND, either express or implied. * ***************************************************************************/ - #include "setup.h" +#undef CURL_HIDDEN_SYMBOLS /* libcurl internal use only */ struct timeval tutil_tvnow(void); @@ -45,5 +45,5 @@ double tutil_tvdiff_secs(struct timeval t1, struct timeval t2); long tutil_tvlong(struct timeval t1); -#endif /* __LIBTEST_TESTUTIL_H */ +#endif /* HEADER_CURL_LIBTEST_TESTUTIL_H */