diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | config.h.dist | 1 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | mktable.c | 12 |
4 files changed, 13 insertions, 29 deletions
@@ -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 @@ -2339,4 +2346,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.269 2002/01/29 03:23:43 ukai Exp $ +$Id: ChangeLog,v 1.270 2002/01/29 16:23:37 ukai Exp $ diff --git a/config.h.dist b/config.h.dist index 3c48320..2104f07 100644 --- 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 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.56 2002/01/29 03:23:44 ukai Exp $ +# $Id: configure,v 1.57 2002/01/29 16:23:37 ukai Exp $ # Configuration. # @@ -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 @@ -1,13 +1,8 @@ -/* $Id: mktable.c,v 1.6 2002/01/29 03:23:44 ukai Exp $ */ +/* $Id: mktable.c,v 1.7 2002/01/29 16:23:37 ukai Exp $ */ #include "config.h" #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* */ |