aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe2021-04-06 18:25:15 +0200
committerGert Doering2021-04-07 08:30:34 +0200
commit6287538039e2ba787c096272c65ec067e667d773 (patch)
treea6e49d6de8057f7c89075f800dd4dac11d554daf
parent17f91332069b4adc317bf11cb4d710b00ee139c5 (diff)
downloadopenvpn-6287538039e2ba787c096272c65ec067e667d773.zip
openvpn-6287538039e2ba787c096272c65ec067e667d773.tar.gz
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>
-rw-r--r--compat.m418
-rw-r--r--configure.ac8
-rw-r--r--src/openvpn/syshead.h4
3 files changed, 1 insertions, 29 deletions
diff --git a/compat.m4 b/compat.m4
index 47650f6..8fa9abe 100644
--- a/compat.m4
+++ b/compat.m4
@@ -47,24 +47,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 23dac74..07a62ad 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 16f5ab1..bca71d5 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>