[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  899e62d1866bc108f488f74e85dcc5a0d6e7ca99 (commit)
      from  a78324d95bd4568ce2c3b34bfa1d6f14cddf92ef (commit)


- Log -----------------------------------------------------------------
commit 899e62d1866bc108f488f74e85dcc5a0d6e7ca99
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Wed Nov 15 21:04:12 2017 +0100

    Fix AppVeyor/VC build failure
    
    ..\test\asn1_internal_test.c(96): warning C4113: 'int (__cdecl *)()'
    differs in parameter lists from 'int (__cdecl *)(void)'
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4744)

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

Summary of changes:
 test/asn1_internal_test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 34f7349..ab4dc35 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -26,7 +26,7 @@
 
 #include "../crypto/asn1/tbl_standard.h"
 
-static int test_tbl_standard()
+static int test_tbl_standard(void)
 {
     const ASN1_STRING_TABLE *tmp;
     int last_nid = -1;
@@ -62,7 +62,7 @@ static int test_tbl_standard()
 #include "internal/asn1_int.h"
 #include "../crypto/asn1/standard_methods.h"
 
-static int test_standard_methods()
+static int test_standard_methods(void)
 {
     const EVP_PKEY_ASN1_METHOD **tmp;
     int last_pkey_id = -1;