]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix windows compile errors in params.c
authorShane Lontis <shane.lontis@oracle.com>
Mon, 12 Aug 2019 01:37:53 +0000 (11:37 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Mon, 12 Aug 2019 04:07:41 +0000 (14:07 +1000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9569)

crypto/params.c

index 87a66820ced9ba366a128778525fd24c665b2598..b3fbb12b9ba1a6eef1081eee2d4d89a079fb19a2 100644 (file)
@@ -11,6 +11,7 @@
 #include <string.h>
 #include <openssl/params.h>
 #include "internal/thread_once.h"
+#include "internal/numbers.h"
 
 OSSL_PARAM *OSSL_PARAM_locate(OSSL_PARAM *p, const char *key)
 {
@@ -685,7 +686,7 @@ int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
             return 1;
         }
     } else if (p->data_type == OSSL_PARAM_UNSIGNED_INTEGER
-               && val == (uintmax_t)val) {
+               && val == (ossl_uintmax_t)val) {
         p->return_size = sizeof(double);
         switch (p->data_size) {
         case sizeof(uint32_t):
@@ -702,7 +703,7 @@ int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
                 return 1;
             }
             break;            }
-    } else if (p->data_type == OSSL_PARAM_INTEGER && val == (intmax_t)val) {
+    } else if (p->data_type == OSSL_PARAM_INTEGER && val == (ossl_intmax_t)val) {
         p->return_size = sizeof(double);
         switch (p->data_size) {
         case sizeof(int32_t):