commit e2acf5133d27fc8d5b682a9c5eeccbb80e046e30
parent 9f6ccf9d524d92c5f31bb8482cd533941ae2e2c4
Author: ukai <ukai>
Date: Tue, 29 Jan 2002 16:23:37 +0000
[w3m-dev 02920] don't use inttypes.h and/or stdint.h
* mktable.c: remove inttypes.h, uintptr_t, use unsigned long instead
* configure: remove inttypes.h detection
* config.h.dist: remove HAVE_INTTYPES_H
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Diffstat:
4 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-30 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 02920] don't use inttypes.h and/or stdint.h
+ * mktable.c: remove inttypes.h, uintptr_t, use unsigned long instead
+ * configure: remove inttypes.h detection
+ * config.h.dist: remove HAVE_INTTYPES_H
+
2002-01-29 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 02921] use inttypes.h instead of stdint.h
diff --git a/config.h.dist b/config.h.dist
@@ -185,7 +185,6 @@ MODEL=Linux.i686-monster-ja
#define JMP_BUF sigjmp_buf
#define HAVE_FLOAT_H
#define HAVE_SYS_SELECT_H
-#undef HAVE_INTTYPES_H
typedef void MySignalHandler;
#define SIGNAL_ARG int _dummy
diff --git a/configure b/configure
@@ -1717,23 +1717,6 @@ else
def_have_sys_select_h='#undef HAVE_SYS_SELECT_H'
fi
-####### check for inttypes
-cat > _zmachdep.c <<EOF
-#include <inttypes.h>
-main()
-{
- uintptr_t p;
- ;
-}
-EOF
-if $cc $cflags -c _zmachdep.c > /dev/null 2>&1
-then
- echo "You have inttypes.h."
- def_have_inttypes_h='#define HAVE_INTTYPES_H'
-else
- def_have_inttypes_h='#undef HAVE_INTTYPES_H'
-fi
-
####### setpgrp(pid, pgrp) or setpgrp() ?
cat > _zmachdep.c << EOF
#include <unistd.h>
@@ -2135,7 +2118,6 @@ $def_longjmp
$def_jmpbuf
$def_have_float_h
$def_have_sys_select_h
-$def_have_inttypes_h
$def_sighandler
$def_sig_arg
diff --git a/mktable.c b/mktable.c
@@ -3,11 +3,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#else
-typedef unsigned long uintptr_t;
-#endif
#include "hash.h"
#include "Str.h"
#include <gc.h>
@@ -20,10 +15,11 @@ defhash(HashItem_ss *, int, hss_i)
#define keycomp(x,y) ((x)==(y))
-static uintptr_t
+/* XXX: we assume sizeof(unsigned long) >= sizeof(void *) */
+static unsigned long
hashfunc(HashItem_ss * x)
{
- return (uintptr_t) x;
+ return (unsigned long) x;
}
/* *INDENT-OFF* */