RT4318: Fix OSSL_SSIZE_MAX for UEFI build

[openssl.git] / include / openssl / e_os2.h

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index fb022b13bd9aa1fd6654e01acf04789839ec365c..8cf6c842726724e31058105469e38ffaacd0c689 100644 (file)
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -1,4 +1,3 @@
-/* e_os2.h */
 /* ====================================================================
  * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
  *
@@ -207,7 +206,7 @@ extern "C" {
 /*-
  * Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
  * certain global symbols that, with some compilers under VMS, have to be
- * defined and declared explicitely with globaldef and globalref.
+ * defined and declared explicitly with globaldef and globalref.
  * Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare
  * DLL exports and imports for compilers under Win32.  These are a little
  * more complicated to use.  Basically, for any library that exports some
@@ -219,25 +218,23 @@ extern "C" {
  * # define OPENSSL_EXTERN OPENSSL_EXPORT
  * #endif
  *
- * The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL
- * have some generally sensible values, and for OPENSSL_EXTERN to have the
- * value OPENSSL_IMPORT.
+ * The default is to have OPENSSL_EXPORT, OPENSSL_EXTERN and OPENSSL_GLOBAL
+ * have some generally sensible values.
  */
 
 # if defined(OPENSSL_SYS_VMS_NODECC)
 #  define OPENSSL_EXPORT globalref
-#  define OPENSSL_IMPORT globalref
+#  define OPENSSL_EXTERN globalref
 #  define OPENSSL_GLOBAL globaldef
 # elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
 #  define OPENSSL_EXPORT extern __declspec(dllexport)
-#  define OPENSSL_IMPORT extern __declspec(dllimport)
+#  define OPENSSL_EXTERN extern __declspec(dllimport)
 #  define OPENSSL_GLOBAL
 # else
 #  define OPENSSL_EXPORT extern
-#  define OPENSSL_IMPORT extern
+#  define OPENSSL_EXTERN extern
 #  define OPENSSL_GLOBAL
 # endif
-# define OPENSSL_EXTERN OPENSSL_IMPORT
 
 /*-
  * Macros to allow global variables to be reached through function calls when
@@ -265,17 +262,21 @@ extern "C" {
 # ifdef _WIN32
 #  ifdef _WIN64
 #   define ossl_ssize_t __int64
+#   define OSSL_SSIZE_MAX _I64_MAX
 #  else
 #   define ossl_ssize_t int
+#   define OSSL_SSIZE_MAX INT_MAX
 #  endif
 # endif
 
-# if defined(__ultrix) && !defined(ssize_t)
+# if (defined(__ultrix) || defined(OPENSSL_SYS_UEFI)) && !defined(ssize_t)
 #  define ossl_ssize_t int
+#  define OSSL_SSIZE_MAX INT_MAX
 # endif
 
 # ifndef ossl_ssize_t
 #  define ossl_ssize_t ssize_t
+#  define OSSL_SSIZE_MAX SSIZE_MAX
 # endif
 
 # ifdef DEBUG_UNUSED
@@ -285,7 +286,7 @@ extern "C" {
 # endif
 
 /* Standard integer types */
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || \
+# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
      defined(__osf__) || defined(__sgi) || defined(__hpux) || \
      defined(OPENSSL_SYS_VMS)
 #  include <inttypes.h>
@@ -320,7 +321,11 @@ typedef unsigned __int64 uint64_t;
  * isn't available or did not define it, just go with hard-coded.
  */
 # ifndef PRIu64
-#  define PRIu64 "lu"
+#  ifdef SIXTY_FOUR_BIT_LONG
+#   define PRIu64 "lu"
+#  else
+#   define PRIu64 "llu"
+#  endif
 # endif
 
 /* ossl_inline: portable inline definition usable in public headers */