From: Darren Tucker <dtucker@dtucker.net>
Date: Sun, 9 Feb 2020 00:23:35 +0000 (+1100)
Subject: Check if UINT32_MAX is defined before redefining.
X-Git-Tag: V_8_2_P1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ccfdb7248e33b1dc8bbac1425ace4598e094cb;p=thirdparty%2Fopenssh-portable.git

Check if UINT32_MAX is defined before redefining.
---

diff --git a/defines.h b/defines.h
index 6c816e782..a347a44ff 100644
--- a/defines.h
+++ b/defines.h
@@ -254,9 +254,11 @@ typedef unsigned int u_int32_t;
 #define __BIT_TYPES_DEFINED__
 #endif
 
-#if  defined(HAVE_DECL_UINT32_MAX) && (HAVE_DECL_UINT32_MAX == 0)
-# if (SIZEOF_INT == 4)
-#   define UINT32_MAX	UINT_MAX
+#ifndef UINT32_MAX
+# if defined(HAVE_DECL_UINT32_MAX) && (HAVE_DECL_UINT32_MAX == 0)
+#  if (SIZEOF_INT == 4)
+#    define UINT32_MAX	UINT_MAX
+#  endif
 # endif
 #endif