[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1a54618ba6ec09b85f00f5ca12ef275b429ff18a (commit)
      from  4bfb96f2ad01d71836cfccceb7b15102f0f59055 (commit)


- Log -----------------------------------------------------------------
commit 1a54618ba6ec09b85f00f5ca12ef275b429ff18a
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 19 11:29:06 2018 +0000

    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 at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/5666)

-----------------------------------------------------------------------

Summary of changes:
 apps/ocsp.c              | 3 ++-
 test/conf_include_test.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 82c11e8..ed2281a 100644
--- 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 41e4da0..7f99d3b 100644
--- 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