summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2011-11-09 20:47:52 +0100
committerAndreas Baumann <abaumann@yahoo.com>2011-11-09 20:47:52 +0100
commit67ae21a73302e0676fa3f0d25210c58350d89042 (patch)
tree0407d3fb01b4d52dc0f6f8f707d53cdf61e635b9
parent404e05db0773d1b7f50bf2fc1403d71328aa50e0 (diff)
downloadwolfbones-67ae21a73302e0676fa3f0d25210c58350d89042.tar.gz
wolfbones-67ae21a73302e0676fa3f0d25210c58350d89042.tar.bz2
fixed on Windows
-rw-r--r--makefiles/nmake/config.mk6
-rw-r--r--tests/port/Makefile.W322
-rw-r--r--tests/port/test_getaddrinfo.c9
-rw-r--r--tests/service/testservice.c1
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 <host> <port>\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"