X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=e_os.h;h=b3a3338eebcfbefb9dfd7526caf171623ef25e1b;hb=e7451ed137450e4bc6c4bec33bc9054bce443feb;hp=0fbc33c551f23555e44a0c221d7cb658680c42c6;hpb=68b00c237298b2e7e382686ffd583847d57bbc0b;p=oweals%2Fopenssl.git

diff --git a/e_os.h b/e_os.h
index 0fbc33c551..b3a3338eeb 100644
--- a/e_os.h
+++ b/e_os.h
@@ -112,7 +112,7 @@ extern "C" {
 #  define MSDOS
 # endif
 
-# if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS)
+# if (defined(MSDOS) || defined(OPENSSL_SYS_UEFI)) && !defined(GETPID_IS_MEANINGLESS)
 #  define GETPID_IS_MEANINGLESS
 # endif
 
@@ -385,6 +385,7 @@ extern FILE *_imp___iob;
                                      __VMS_EXIT |= 0x10000000; \
                                      exit(__VMS_EXIT); } while(0)
 #   define NO_SYS_PARAM_H
+#   define NO_SYS_UN_H
 
 #  elif defined(OPENSSL_SYS_NETWARE)
 #   include <fcntl.h>
@@ -604,7 +605,7 @@ extern int sys_nerr;
 #  define strerror(errnum) \
         (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
   /* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */
-#  include "crypto/o_str.h"
+#  include "internal/o_str.h"
 #  define memcmp OPENSSL_memcmp
 # endif
 
@@ -623,7 +624,7 @@ extern int sys_nerr;
 #  define strncasecmp _strnicmp
 # elif defined(OPENSSL_SYS_VMS)
 /* VMS below version 7.0 doesn't have strcasecmp() */
-#  include "o_str.h"
+#  include "internal/o_str.h"
 #  define strcasecmp OPENSSL_strcasecmp
 #  define strncasecmp OPENSSL_strncasecmp
 #  define OPENSSL_IMPLEMENTS_strncasecmp
@@ -688,6 +689,8 @@ struct servent *getservbyname(const char *name, const char *proto);
 #  endif
 # endif
 
+#define OSSL_NELEM(x)    (sizeof(x)/sizeof(x[0]))
+
 #ifdef  __cplusplus
 }
 #endif