From 4d4e09c3de951466d81e9ade6273a5973079f4f1 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 12 Jun 2011 12:48:31 +0100 Subject: [PATCH] In configure, remove default Haskell equivalent of C types The macro was just ignoring the defaults. --- aclocal.m4 | 2 +- configure.ac | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d522b77..d444fcf 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -112,7 +112,7 @@ AC_DEFUN([FPTOOLS_HTYPE_INCLUDES], dnl ** Map an arithmetic C type to a Haskell type. dnl Based on autconf's AC_CHECK_SIZEOF. -dnl FPTOOLS_CHECK_HTYPE(TYPE [, DEFAULT_VALUE ]) +dnl FPTOOLS_CHECK_HTYPE(TYPE) AC_DEFUN([FPTOOLS_CHECK_HTYPE],[ changequote(<<, >>) dnl The name to #define. diff --git a/configure.ac b/configure.ac index 87b41b5..b19e800 100644 --- a/configure.ac +++ b/configure.ac @@ -86,13 +86,12 @@ FPTOOLS_CHECK_HTYPE(double) FPTOOLS_CHECK_HTYPE(ptrdiff_t) FPTOOLS_CHECK_HTYPE(size_t) FPTOOLS_CHECK_HTYPE(wchar_t) -# Int32 is a HACK for non-ISO C compilers -FPTOOLS_CHECK_HTYPE(sig_atomic_t, Int32) +FPTOOLS_CHECK_HTYPE(sig_atomic_t) FPTOOLS_CHECK_HTYPE(clock_t) FPTOOLS_CHECK_HTYPE(time_t) FPTOOLS_CHECK_HTYPE(useconds_t) FPTOOLS_CHECK_HTYPE(suseconds_t) -FPTOOLS_CHECK_HTYPE(dev_t, Word32) +FPTOOLS_CHECK_HTYPE(dev_t) FPTOOLS_CHECK_HTYPE(ino_t) FPTOOLS_CHECK_HTYPE(mode_t) FPTOOLS_CHECK_HTYPE(off_t) @@ -108,16 +107,8 @@ FPTOOLS_CHECK_HTYPE(rlim_t) FPTOOLS_CHECK_HTYPE(intptr_t) FPTOOLS_CHECK_HTYPE(uintptr_t) -# Workaround for OSes that don't have intmax_t and uintmax_t, e.g. OpenBSD. -if test "$ac_cv_type_long_long" = yes; then - fptools_cv_default_htype_intmax=$fptools_cv_htype_long_long - fptools_cv_default_htype_uintmax=$fptools_cv_htype_unsigned_long_long -else - fptools_cv_default_htype_intmax=$fptools_cv_htype_long - fptools_cv_default_htype_uintmax=$fptools_cv_htype_unsigned_long -fi -FPTOOLS_CHECK_HTYPE(intmax_t, $fptools_cv_default_htype_intmax) -FPTOOLS_CHECK_HTYPE(uintmax_t, $fptools_cv_default_htype_uintmax) +FPTOOLS_CHECK_HTYPE(intmax_t) +FPTOOLS_CHECK_HTYPE(uintmax_t) # test errno values FP_CHECK_CONSTS([E2BIG EACCES EADDRINUSE EADDRNOTAVAIL EADV EAFNOSUPPORT EAGAIN EALREADY EBADF EBADMSG EBADRPC EBUSY ECHILD ECOMM ECONNABORTED ECONNREFUSED ECONNRESET EDEADLK EDESTADDRREQ EDIRTY EDOM EDQUOT EEXIST EFAULT EFBIG EFTYPE EHOSTDOWN EHOSTUNREACH EIDRM EILSEQ EINPROGRESS EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE EMLINK EMSGSIZE EMULTIHOP ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH ENFILE ENOBUFS ENODATA ENODEV ENOENT ENOEXEC ENOLCK ENOLINK ENOMEM ENOMSG ENONET ENOPROTOOPT ENOSPC ENOSR ENOSTR ENOSYS ENOTBLK ENOTCONN ENOTDIR ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOPNOTSUPP EPERM EPFNOSUPPORT EPIPE EPROCLIM EPROCUNAVAIL EPROGMISMATCH EPROGUNAVAIL EPROTO EPROTONOSUPPORT EPROTOTYPE ERANGE EREMCHG EREMOTE EROFS ERPCMISMATCH ERREMOTE ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH ESRMNT ESTALE ETIME ETIMEDOUT ETOOMANYREFS ETXTBSY EUSERS EWOULDBLOCK EXDEV ENOCIGAR], [#include -- 1.7.10.4