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>

diff --git a/compat.m4 b/compat.m4
index 47650f6d38a6759f2649e7b241e324767d7a3a36..8fa9abee12888e55a68443f48a7fdf9ccf75ef5d 100644 (file)
--- 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 23dac74f1156e67b7770cf39d0735d9e46c0380f..07a62ad8fbd6f8dabd18e8a6263a9e87e1a2a32d 100644 (file)
--- 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 16f5ab11f4c0d4917ba44fda4624138a15052f5e..bca71d5cfba6cfd58c1ad93e6bbb5503947f7917 100644 (file)
--- 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>