[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_0-stable has been updated
       via  b2a73156186ec436f584a565e6d4a98b75734286 (commit)
      from  dba995e78f09ccf00a3cf1b1c4c196febd2a7fa4 (commit)


- Log -----------------------------------------------------------------
commit b2a73156186ec436f584a565e6d4a98b75734286
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Aug 17 09:02:53 2018 +0200

    Fix a warning from MSVC build
    
    Apparently after internal/numbers.h defines INTx_MIN/MAX
    stdint gets included and it defines those differently:
    
    C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\stdint.h(48):
     warning C4005: 'INT8_MIN': macro redefinition
    
    Avoid that by changing the sequence in which the include files
    appear in crypto/bio/b_print.c.
    
    [extended tests]
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6995)

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

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

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index cdfe05f..bf006d1 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -10,9 +10,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "internal/numbers.h"
-#include "internal/cryptlib.h"
 #include <openssl/bio.h>
+#include "internal/cryptlib.h"
+#include "internal/numbers.h"
 
 /*
  * Copyright Patrick Powell 1995