3 files changed, 4 insertions, 9 deletions

diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index 7bbdb02..d5f7813 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -22,7 +22,7 @@ else()
         set(NC_SRC ${NC_SRC} compat/accept4.c)
 endif()
 
-check_function_exists(readpassphrase HAVE_READPASSPHRASE)
+check_symbol_exists(readpassphrase "readpassphrase.h" HAVE_READPASSPHRASE)
 if(HAVE_READPASSPHRASE)
         add_definitions(-DHAVE_READPASSPHRASE)
 else()
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 810408d..ee1b65b 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -88,11 +88,6 @@ endif
 endif
 
 noinst_HEADERS = apps.h
-noinst_HEADERS += progs.h
-noinst_HEADERS += s_apps.h
-noinst_HEADERS += testdsa.h
-noinst_HEADERS += testrsa.h
-noinst_HEADERS += timeouts.h
 
 EXTRA_DIST = CMakeLists.txt
 
diff --git a/apps/openssl/compat/poll_win.c b/apps/openssl/compat/poll_win.c
index c9422b9..30f6b60 100644
--- a/apps/openssl/compat/poll_win.c
+++ b/apps/openssl/compat/poll_win.c
@@ -248,12 +248,12 @@ poll(struct pollfd *pfds, nfds_t nfds, int timeout_ms)
         timespent_ms = 0;
         wait_rc = WAIT_FAILED;
 
-        if (timeout_ms < 0)
+        looptime_ms = (timeout_ms > 100 || timeout_ms == -1) ? 100 : timeout_ms;
+        if (timeout_ms == -1)
                 timeout_ms = INFINITE;
-        looptime_ms = timeout_ms > 100 ? 100 : timeout_ms;
 
         do {
-                struct timeval tv;
+                TIMEVAL tv;
                 tv.tv_sec = 0;
                 tv.tv_usec = looptime_ms * 1000;
                 int handle_signaled = 0;