From 7d342c723c5ae8e9312210936287810741f40bc5 Mon Sep 17 00:00:00 2001 From: "U-D5B1PQ1J\\Administrador" Date: Sat, 7 Aug 2010 14:33:14 +0200 Subject: build: allow NTLM tests to run on more build configurations --- tests/libtest/chkhostname.c | 4 ++-- tests/libtest/sethostname.c | 17 ++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'tests/libtest') diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c index 686eb471a..72c8b6a1f 100644 --- a/tests/libtest/chkhostname.c +++ b/tests/libtest/chkhostname.c @@ -1,6 +1,6 @@ -#include "curl_gethostname.h" +#include "setup.h" -#include +#include "curl_gethostname.h" #define HOSTNAME_MAX 1024 diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c index d050f18d6..9d9fae00b 100644 --- a/tests/libtest/sethostname.c +++ b/tests/libtest/sethostname.c @@ -7,25 +7,20 @@ * */ -#include -#include - -#define GETHOSTNAME_ENV_VAR "CURL_GETHOSTNAME" +#include "setup.h" /* * we force our own host name, in order to make some tests machine independent - * - * Since some systems think this prototype doesn't match the system provided - * function, we AVOID including unistd.h or other headers that may include the - * original prototype! We provide our own instead (to avoid warnings). */ -int gethostname(char *name, size_t namelen); -int gethostname(char *name, size_t namelen) +int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen); + +int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) { - const char *force_hostname = getenv(GETHOSTNAME_ENV_VAR); + const char *force_hostname = getenv("CURL_GETHOSTNAME"); if(force_hostname) { strncpy(name, force_hostname, namelen); + name[namelen-1] = '\0'; return 0; } -- cgit v1.2.3