From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Fri, 17 Aug 2018 07:02:53 +0000 (+0200)
Subject: Fix a warning from MSVC build
X-Git-Tag: OpenSSL_1_1_0j~71
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2a73156186ec436f584a565e6d4a98b75734286;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6995)
---

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index cdfe05f93c..bf006d122c 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