Use autoconf macros to define exact-width types if missing.

diff --git a/configure.ac b/configure.ac
index 9cd7c5a1268ab8f83e15ee35c134e228596db7e0..dc2d2c78b0880958763e74b133754f852ededf76 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -531,56 +531,10 @@ dnl AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 8)
 AC_CHECK_SIZEOF(int *, 4)
 
-dnl# see usage below
-AC_DEFUN([RXVT_CHECK_SIZE],
-  [AC_CACHE_CHECK([for $2], $1,
-    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdint.h>]], [[$2 dummy;]])],[$1=yes],[dnl
-if test "$ac_cv_sizeof_char" -ge $3; then
-  $1="$4 char"
-else
-  if test "$ac_cv_sizeof_short" -ge $3; then
-    $1="$4 short"
-  else
-    if test "$ac_cv_sizeof_int" -ge $3; then
-      $1="$4 int"
-    else
-      if test "$ac_cv_sizeof_long" -ge $3; then
-        $1="$4 long"
-      else
-        if test "$ac_cv_sizeof_long_long" -ge $3; then
-          $1="$4 long long"
-        else
-          $1="$4 $5" # we _must_ have a (possibly wrong) default
-        fi
-      fi
-    fi
-  fi
-fi])])]
-if test x"$$1" != xyes; then
-  $6="typedef $$1 $2;"
-else
-  if test x"$4" = x; then
-    $6="/* typedef $5 $2; */"
-  else
-    $6="/* typedef $4 $5 $2; */"
-  fi
-fi dnl
-)
-dnl#
-dnl# Look for types the system may know about anyway.
-dnl#
-RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef)
-AC_SUBST(rxvt_int16_typedef)
-RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef)
-AC_SUBST(rxvt_uint16_typedef)
-RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef)
-AC_SUBST(rxvt_int32_typedef)
-RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef)
-AC_SUBST(rxvt_uint32_typedef)
-dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef)
-dnl AC_SUBST(rxvt_int64_typedef)
-dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef)
-dnl AC_SUBST(rxvt_uint64_typedef)
+AC_TYPE_INT16_T
+AC_TYPE_UINT16_T
+AC_TYPE_INT32_T
+AC_TYPE_UINT32_T
 
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR LIBRARY FUNCTIONS

diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index 5af947cab8349a10be201391d64e4700bd1cafdc..63bb911f994796e183ddbe584bd6aa87aa3157fe 100644 (file)
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -33,15 +33,6 @@ extern "C" {
 #include <X11/Xresource.h>
 }
 
-/*
- * If we haven't pulled in typedef's like  int16_t  then do them ourself
- * type of (normal and unsigned) basic sizes
- */
-@rxvt_int16_typedef@
-@rxvt_uint16_typedef@
-@rxvt_int32_typedef@
-@rxvt_uint32_typedef@
-
 struct rxvt_fontset;
 struct rxvt_color;
 struct rxvt_vars;               /* defined later on */