1 files changed, 2 insertions, 8 deletions

diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c
index a38c7581e6..e319faa47b 100644
--- a/src/lib/libcrypto/ui/ui_openssl.c
+++ b/src/lib/libcrypto/ui/ui_openssl.c
@@ -122,15 +122,9 @@
  * sigaction and fileno included. -pedantic would be more appropriate for
  * the intended purposes, but we can't prevent users from adding -ansi.
  */
-#if defined(OPENSSL_SYSNAME_VXWORKS)
-#include <sys/types.h>
-#endif
-
 #if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
-#ifndef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE 2
 #endif
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
@@ -404,8 +398,8 @@ static int read_till_nl(FILE *in)
         char buf[SIZE+1];
 
         do      {
-                if (!fgets(buf,SIZE,in))
-                        return 0;
+                if (fgets(buf,sizeof(buf),in) == NULL)
+                        break;
                 } while (strchr(buf,'\n') == NULL);
         return 1;
         }