[w3m-dev 02921] use inttypes.h instead of stdint.h

* configure: check inttypes.h instead of stdint.h
* config.h.dist: s/STDINT_H/INTTYPES_H/
* mktable.c: use inttypes.h instead of stdint.h
From: Fumitoshi UKAI  <ukai@debian.or.jp>

4 files changed, 32 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 884b5d0..103a2b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-29  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 02921] use inttypes.h instead of stdint.h
+	* configure: check inttypes.h instead of stdint.h
+	* config.h.dist: s/STDINT_H/INTTYPES_H/
+	* mktable.c: use inttypes.h instead of stdint.h
+
 2002-01-28  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 02919] no need of width
@@ -2332,4 +2339,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.268 2002/01/28 14:44:56 ukai Exp $
+$Id: ChangeLog,v 1.269 2002/01/29 03:23:43 ukai Exp $
diff --git a/config.h.dist b/config.h.dist
index b7cc222..3c48320 100644
--- a/config.h.dist
+++ b/config.h.dist
@@ -185,7 +185,7 @@ MODEL=Linux.i686-monster-ja
 #define JMP_BUF sigjmp_buf
 #define HAVE_FLOAT_H
 #define HAVE_SYS_SELECT_H
-#undef HAVE_STDINT_H
+#undef HAVE_INTTYPES_H
 
 typedef void MySignalHandler;
 #define SIGNAL_ARG int _dummy
diff --git a/configure b/configure
index 1dfcd68..4c7c641 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.55 2002/01/21 15:56:13 ukai Exp $
+# $Id: configure,v 1.56 2002/01/29 03:23:44 ukai Exp $
 #	Configuration.
 #
 
@@ -1717,20 +1717,21 @@ else
   def_have_sys_select_h='#undef HAVE_SYS_SELECT_H'
 fi
 
-####### check for stdint.h
+####### check for inttypes
 cat > _zmachdep.c <<EOF
-#include <stdint.h>
+#include <inttypes.h>
 main()
 { 
+  uintptr_t p;
   ;
 }
 EOF
 if $cc $cflags -c _zmachdep.c > /dev/null 2>&1
 then
-  echo "You have stdint.h."
-  def_have_stdint_h='#define HAVE_STDINT_H'
+  echo "You have inttypes.h."
+  def_have_inttypes_h='#define HAVE_INTTYPES_H'
 else
-  def_have_stdint_h='#undef HAVE_STDINT_H'
+  def_have_inttypes_h='#undef HAVE_INTTYPES_H'
 fi
 
 ####### setpgrp(pid, pgrp) or setpgrp() ?
@@ -2134,7 +2135,7 @@ $def_longjmp
 $def_jmpbuf
 $def_have_float_h
 $def_have_sys_select_h
-$def_have_stdint_h
+$def_have_inttypes_h
 
 $def_sighandler
 $def_sig_arg
diff --git a/mktable.c b/mktable.c
index b57f804..d2b3bec 100644
--- a/mktable.c
+++ b/mktable.c
@@ -1,12 +1,12 @@
-/* $Id: mktable.c,v 1.5 2001/12/23 14:31:38 ukai Exp $ */
+/* $Id: mktable.c,v 1.6 2002/01/29 03:23:44 ukai Exp $ */
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef HAVE_STDINT_H
-#include "stdint.h"
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
 #else
-typedef unsigned int uintptr_t;
+typedef unsigned long uintptr_t;
 #endif
 #include "hash.h"
 #include "Str.h"
@@ -14,16 +14,24 @@ typedef unsigned int uintptr_t;
 
 #include "gcmain.c"
 
+/* *INDENT-OFF* */
 defhash(HashItem_ss *, int, hss_i)
+/* *INDENT-ON* */
+
 #define keycomp(x,y) ((x)==(y))
-     static uintptr_t hashfunc(HashItem_ss * x)
+
+static uintptr_t
+hashfunc(HashItem_ss * x)
 {
     return (uintptr_t) x;
 }
 
+/* *INDENT-OFF* */
 defhashfunc(HashItem_ss *, int, hss_i)
-     int
-      MAIN(int argc, char *argv[], char **envp)
+/* *INDENT-ON* */
+
+int
+MAIN(int argc, char *argv[], char **envp)
 {
     FILE *f;
     Hash_ss *hash;