From 67ae21a73302e0676fa3f0d25210c58350d89042 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 9 Nov 2011 20:47:52 +0100 Subject: fixed on Windows --- makefiles/nmake/config.mk | 6 ++++-- tests/port/Makefile.W32 | 2 +- tests/port/test_getaddrinfo.c | 9 ++++----- tests/service/testservice.c | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/makefiles/nmake/config.mk b/makefiles/nmake/config.mk index c45e359..7a01f94 100644 --- a/makefiles/nmake/config.mk +++ b/makefiles/nmake/config.mk @@ -16,10 +16,12 @@ #PLATFORM_SDK_DIR = C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2 #PLATFORM_SDK_DIR = C:\Programme\Microsoft Platform SDK for Windows Server 2003 R2 #PLATFORM_SDK_DIR = D:\Programme\Microsoft Platform SDK -PLATFORM_SDK_DIR = C:\Program Files\Microsoft SDKs\Windows\v7.0 +#PLATFORM_SDK_DIR = C:\Program Files\Microsoft SDKs\Windows\v7.0 +PLATFORM_SDK_DIR = D:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2 # OpenSSL (http://www.slproweb.com/products/Win32OpenSSL.html) ############################################################## #OPENSSL_DIR=C:\Program Files\OpenSSL -OPENSSL_DIR=C:\Programme\OpenSSL +#OPENSSL_DIR=C:\Programme\OpenSSL +OPENSSL_DIR = D:\Program Files\OpenSSL-1.0.0d diff --git a/tests/port/Makefile.W32 b/tests/port/Makefile.W32 index 22203ad..bfd895b 100644 --- a/tests/port/Makefile.W32 +++ b/tests/port/Makefile.W32 @@ -65,6 +65,6 @@ local_test: @echo Testing itoa.. @test_itoa >NUL 2>NUL @echo Testing getaddrinfo.. - @test_getaddrinfo >NUL 2>NUL + @test_getaddrinfo localhost 80 >NUL 2>NUL @echo Testing gai_strerror_r.. @test_gai_strerror_r >NUL 2>NUL diff --git a/tests/port/test_getaddrinfo.c b/tests/port/test_getaddrinfo.c index 24fc19b..3de47b8 100644 --- a/tests/port/test_getaddrinfo.c +++ b/tests/port/test_getaddrinfo.c @@ -28,17 +28,16 @@ int main( int argc, char **argv ) { struct addrinfo *result; struct addrinfo *res; int error; +#ifdef _WIN32 + WSADATA wsa_data; + WSAStartup( MAKEWORD( 2, 2 ), &wsa_data ); +#endif if( argc != 3 ) { fputs( "usage: test_getaddrinfo \n", stderr ); exit( EXIT_FAILURE ); } -#ifdef _WIN32 - WSADATA wsa_data; - WSAStartup( MAKEWORD( 2, 2 ), &wsa_data ); -#endif - /* tell getaddrinfo what we want */ memset( &hints, 0, sizeof( struct addrinfo ) ); hints.ai_flags = AI_PASSIVE; diff --git a/tests/service/testservice.c b/tests/service/testservice.c index e2c7b48..59e2dfd 100644 --- a/tests/service/testservice.c +++ b/tests/service/testservice.c @@ -18,7 +18,6 @@ #include "log/log.h" /* for logging */ #include "log/messages.h" /* for i18n */ #include "port/string.h" /* for strcasecmp */ -#include "port/gettext.h" /* for i18n */ #include "errors.h" #include "service/service.h" -- cgit v1.2.3-54-g00ecf