From d718c65067c89dd04c004f3e7ea927625f803c35 Mon Sep 17 00:00:00 2001
From: Joakim Soderberg <joakim.soderberg@gmail.com>
Date: Tue, 18 Feb 2014 13:38:14 +0100
Subject: [PATCH] Fix compilation on Windows.

C89 which Microsofts compiler only support does not allow variable
declarations anywhere but at the start of a scope.

Also, only try to copy the test-server files if they actually exists. For
instance the OpenSSL cert generation fails if you run cmake under the git
bash shell on Windows (won't work with the unix method either) so that
file will be missing... This would result in a compilation error when
tests where turned on.
---
 CMakeLists.txt      | 27 ++++++++++++++++++++-------
 lib/libwebsockets.c |  3 ++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97b120bcee..0bce472909 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -566,7 +566,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 			"${PROJECT_SOURCE_DIR}/test-server/test.html")
 
 		# Generate self-signed SSL certs for the test-server.
-		if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE)
+		if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER)
 			message("Generating SSL Certificates for the test-server...")
 
 			set(TEST_SERVER_SSL_KEY "${PROJECT_BINARY_DIR}/libwebsockets-test-server.key.pem")
@@ -595,7 +595,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 				message("\n")
 
 				if (OPENSSL_RETURN_CODE)
-					message("!!! Failed to generate SSL certificate !!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
+					message(WARNING "!!! Failed to generate SSL certificate for Test Server using cmd.exe !!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
+				else()
+					message("SUCCSESFULLY generated SSL certificate")
 				endif()
 			else()
 				# Unix.
@@ -603,7 +605,13 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 					COMMAND printf "GB\\nErewhon\\nAll around\\nlibwebsockets-test\\n\\nlocalhost\\nnone@invalid.org\\n"
 					COMMAND "${OPENSSL_EXECUTABLE}"
 						req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-					)
+					RESULT_VARIABLE OPENSSL_RETURN_CODE)
+
+				if (OPENSSL_RETURN_CODE)
+					message(WARNING "!!! Failed to generate SSL certificate for Test Server!!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
+				else()
+					message("SUCCSESFULLY generated SSL certificate")
+				endif()
 			endif()
 
 			list(APPEND TEST_SERVER_DATA 
@@ -611,13 +619,18 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 				"${TEST_SERVER_SSL_CERT}")
 		endif()
 
+		add_custom_command(TARGET test-server
+						POST_BUILD 
+						COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server")
+
 		# Copy the file needed to run the server so that the test apps can
 		# reach them from their default output location
 		foreach (TEST_FILE ${TEST_SERVER_DATA})
-			add_custom_command(TARGET test-server
-						POST_BUILD 
-						COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server"
-						COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM)
+			if (EXISTS ${TEST_FILE})
+				add_custom_command(TARGET test-server
+							POST_BUILD 
+							COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM)
+			endif()
 		endforeach()
 	endif(NOT LWS_WITHOUT_SERVER)
 
diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 5e3f50eb2e..f160d90c17 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -114,6 +114,8 @@ int
 insert_wsi_socket_into_fds(struct libwebsocket_context *context,
 						       struct libwebsocket *wsi)
 {
+	struct libwebsocket_pollargs pa = {wsi->sock, POLLIN, 0 };
+
 	if (context->fds_count >= context->max_fds) {
 		lwsl_err("Too many fds (%d)\n", context->max_fds);
 		return 1;
@@ -131,7 +133,6 @@ insert_wsi_socket_into_fds(struct libwebsocket_context *context,
 	lwsl_info("insert_wsi_socket_into_fds: wsi=%p, sock=%d, fds pos=%d\n",
 					    wsi, wsi->sock, context->fds_count);
 
-	struct libwebsocket_pollargs pa = {wsi->sock, POLLIN, 0 };
 	context->protocols[0].callback(context, wsi,
 		LWS_CALLBACK_LOCK_POLL,
 		wsi->user_space, (void *) &pa, 0);