Fix no-posix-io compile failure

The fix in conf_include_test.c  seems to be required because some
compilers give an error if you give an empty string for the second
argument to strpbrk(). It doesn't really make sense to send an empty
string for this argument anyway, so make sure it has at least one character
in it.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5666)

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 82c11e8b60c68d08f32334d7e7570a203a16ba7b..ed2281a5960eb3b1406cc0a1bdf7c00d8ff6371a 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -36,7 +36,8 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <openssl/x509v3.h>
 # include <openssl/rand.h>
 
-# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK)
+# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \
+     && !defined(OPENSSL_NO_POSIX_IO)
 #  define OCSP_DAEMON
 #  include <sys/types.h>
 #  include <sys/wait.h>

diff --git a/test/conf_include_test.c b/test/conf_include_test.c
index 41e4da04eb309c4dec90dcfc5c34cf3a3f708030..7f99d3b15f1de223d1fce47cb2740213dcd518b6 100644 (file)
--- a/test/conf_include_test.c
+++ b/test/conf_include_test.c
@@ -30,7 +30,7 @@
 #else
 /* the test does not work without chdir() */
 # define chdir(x) (-1);
-# define DIRSEP ""
+# define DIRSEP "/"
 #  define DIRSEP_PRESERVE 0
 #endif