[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6f84b383d3c19a1993f08cdfa9a23d7649161823 (commit)
      from  3aef36ffef89849348049296892327e6fdf9d705 (commit)


- Log -----------------------------------------------------------------
commit 6f84b383d3c19a1993f08cdfa9a23d7649161823
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 13 20:25:08 2016 +0100

    VMS C doesn't provide intmax_t/uinmax_t, use our own
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 include/openssl/ossl_typ.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h
index 059d386..ebe091c 100644
--- a/include/openssl/ossl_typ.h
+++ b/include/openssl/ossl_typ.h
@@ -201,7 +201,8 @@ typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
 typedef struct ocsp_response_st OCSP_RESPONSE;
 typedef struct ocsp_responder_id_st OCSP_RESPID;
 
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
+    && !defined(OPENSSL_SYS_VMS);
 typedef intmax_t ossl_intmax_t;
 typedef uintmax_t ossl_uintmax_t;
 #else