From: Darren Tucker <dtucker@dtucker.net>
Date: Sun, 26 Jan 2020 04:09:15 +0000 (+1100)
Subject: Move definition of UINT32_MAX.
X-Git-Tag: V_8_2_P1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d1144769151edf65f74aee9a4c8545c37861695;p=thirdparty%2Fopenssh-portable.git

Move definition of UINT32_MAX.

This allows us to always define it if needed not just if we also
define the type ourself.
---

diff --git a/defines.h b/defines.h
index 03212de6f..86507ab67 100644
--- a/defines.h
+++ b/defines.h
@@ -244,9 +244,6 @@ typedef unsigned short int u_int16_t;
 #  endif
 #  if (SIZEOF_INT == 4)
 typedef unsigned int u_int32_t;
-#    if defined(HAVE_DECL_UINT32_MAX) && (HAVE_DECL_UINT32_MAX == 0)
-#      define UINT32_MAX	UINT_MAX
-#    endif
 #  else
 #    error "32 bit int type not found."
 #  endif
@@ -254,6 +251,12 @@ 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
+# endif
+#endif
+
 /* 64-bit types */
 #ifndef HAVE_INT64_T
 # if (SIZEOF_LONG_INT == 8)