[Openvpn-devel,2/5] Remove checks for uint* types that are part of C99

Message ID 20210406162518.4075-2-arne@rfc2549.org
State Accepted
Headers show
Series
  • [Openvpn-devel,1/5] Remove check for socket functions and Win XP compatbility code
Related show

Commit Message

Arne Schwabe April 6, 2021, 4:25 p.m.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 compat.m4             | 18 ------------------
 configure.ac          |  8 --------
 src/openvpn/syshead.h |  4 +---
 3 files changed, 1 insertion(+), 29 deletions(-)

Comments

Antonio Quartulli April 6, 2021, 8:39 p.m. | #1
Hi,

On 06/04/2021 18:25, Arne Schwabe wrote:
> Signed-off-by: Arne Schwabe <arne@rfc2549.org>

As expected this patch creates no issues on the platforms I could test
(mingw, gcc-10 and gcc-9).

Acked-by: Antonio Quartulli <antonio@openvpn.net>

Gert should be able to test on *more ancient things* that we still support.

Regards,
Gert Doering April 6, 2021, 8:51 p.m. | #2
Hi,

On Tue, Apr 06, 2021 at 10:39:59PM +0200, Antonio Quartulli wrote:
> Gert should be able to test on *more ancient things* that we still support.

Hardly :-) - David maintains the software museum.

My oldest machine is FreeBSD 7.4, which has been EOLed since like
ages, and even that one has <inttypes.h> and <stdint.h>...

(I'm fairly sure it breaks Solaris 2.5, but I so do not care :-) - we
do support OpenSolaris 11, and that can do C99 fine)

gert
Gert Doering April 7, 2021, 7:07 a.m. | #3
Your patch has been applied to the master branch.

I have stared at the patch a bit, and pushed it ot all the buildbots,
which are "all green".  So that's the oldest stuff I care about...
(and since we require a C99 compiler anyway, expecting C99 headers
should be reasonable nowadays)

commit 6287538039e2ba787c096272c65ec067e667d773
Author: Arne Schwabe
Date:   Tue Apr 6 18:25:15 2021 +0200

     Remove checks for uint* types that are part of C99

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Antonio Quartulli <antonio@openvpn.net>
     Message-Id: <20210406162518.4075-2-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22049.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
David Sommerseth April 13, 2021, 12:46 p.m. | #4
On 06/04/2021 22:51, Gert Doering wrote:
> Hi,
> 
> On Tue, Apr 06, 2021 at 10:39:59PM +0200, Antonio Quartulli wrote:
>> Gert should be able to test on *more ancient things* that we still support.
> 
> Hardly :-) - David maintains the software museum.
> 
> My oldest machine is FreeBSD 7.4, which has been EOLed since like
> ages, and even that one has <inttypes.h> and <stdint.h>...

FreeBSD 7.4 is the software museum [0] ;-)  RHEL-7.0 was released 15 
months _after_ FreeBSD 7.4.  RHEL-7 is oldest the supported Linux distro 
we officially support in OpenVPN, and it gets updates from Red Hat until 
June 20204 [1].  RHEL-7 is fully C99 capable.

[0] <https://endoflife.software/operating-systems/linux/FreeBSD>
[1] 
<https://endoflife.software/operating-systems/linux/red-hat-enterprise-linux-rhel#7>

Patch

diff --git a/compat.m4 b/compat.m4
index 47650f6d3..8fa9abee1 100644
--- a/compat.m4
+++ b/compat.m4
@@ -46,24 +46,6 @@  ifdef(
 	,
 	[AC_DEFUN([AC_PROG_SED], [AC_CHECK_PROGS([SED], [sed])])]
 )
-ifdef(
-	[AC_TYPE_INT8_T],
-	,
-	[
-		AC_CHECK_HEADERS([inttypes.h stdint.h])
-		test -z "${ac_cv_header_inttypes_h}${ac_cv_header_stdint_h}" && \
-			AC_MSG_ERROR([Required inttypes.h stdint.h not found])
-		
-		AC_DEFUN([AC_TYPE_INT8_T], [])
-		AC_DEFUN([AC_TYPE_INT16_T], [])
-		AC_DEFUN([AC_TYPE_INT32_T], [])
-		AC_DEFUN([AC_TYPE_INT64_T], [])
-		AC_DEFUN([AC_TYPE_UINT8_T], [])
-		AC_DEFUN([AC_TYPE_UINT16_T], [])
-		AC_DEFUN([AC_TYPE_UINT32_T], [])
-		AC_DEFUN([AC_TYPE_UINT64_T], [])
-	]
-)
 ifdef(
 	[PKG_CHECK_VAR],
 	,
diff --git a/configure.ac b/configure.ac
index 23dac74f1..07a62ad8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,14 +409,6 @@  AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
 AC_TYPE_SIGNAL
 AX_TYPE_SOCKLEN_T
 AC_CHECK_SIZEOF([unsigned int])
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 16f5ab11f..bca71d5cf 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -118,11 +118,9 @@ 
 #include <stdlib.h>
 #endif
 
-#ifdef HAVE_INTTYPES_H
+/* These headers belong to C99 and should be always be present */
 #include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
 #include <stdint.h>
-#endif
 
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>