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.
diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 453c1e7..266d5a2 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -114,6 +114,8 @@
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 @@
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);