storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
Fumitoshi UKAI
2002-01-29 03:23:43 +00:00
parent 796913920d
commit 3db3a9da5f
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -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> 2002-01-28 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02919] no need of width * [w3m-dev 02919] no need of width
@@ -2332,4 +2339,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-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 $

2
config.h.dist
View File

@@ -185,7 +185,7 @@ MODEL=Linux.i686-monster-ja
#define JMP_BUF sigjmp_buf #define JMP_BUF sigjmp_buf
#define HAVE_FLOAT_H #define HAVE_FLOAT_H
#define HAVE_SYS_SELECT_H #define HAVE_SYS_SELECT_H
#undef HAVE_STDINT_H #undef HAVE_INTTYPES_H
typedef void MySignalHandler; typedef void MySignalHandler;
#define SIGNAL_ARG int _dummy #define SIGNAL_ARG int _dummy

15
configure vendored
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/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. # Configuration.
# #
@@ -1717,20 +1717,21 @@ else
def_have_sys_select_h='#undef HAVE_SYS_SELECT_H' def_have_sys_select_h='#undef HAVE_SYS_SELECT_H'
fi fi
####### check for stdint.h ####### check for inttypes
cat > _zmachdep.c <<EOF cat > _zmachdep.c <<EOF
#include <stdint.h> #include <inttypes.h>
main() main()
{ {
uintptr_t p;
; ;
} }
EOF EOF
if $cc $cflags -c _zmachdep.c > /dev/null 2>&1 if $cc $cflags -c _zmachdep.c > /dev/null 2>&1
then then
echo "You have stdint.h." echo "You have inttypes.h."
def_have_stdint_h='#define HAVE_STDINT_H' def_have_inttypes_h='#define HAVE_INTTYPES_H'
else else
def_have_stdint_h='#undef HAVE_STDINT_H' def_have_inttypes_h='#undef HAVE_INTTYPES_H'
fi fi
####### setpgrp(pid, pgrp) or setpgrp() ? ####### setpgrp(pid, pgrp) or setpgrp() ?
@@ -2134,7 +2135,7 @@ $def_longjmp
$def_jmpbuf $def_jmpbuf
$def_have_float_h $def_have_float_h
$def_have_sys_select_h $def_have_sys_select_h
$def_have_stdint_h $def_have_inttypes_h
$def_sighandler $def_sighandler
$def_sig_arg $def_sig_arg

18
mktable.c
View File

@@ -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 "config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_STDINT_H #ifdef HAVE_INTTYPES_H
#include "stdint.h" #include <inttypes.h>
#else #else
typedef unsigned int uintptr_t; typedef unsigned long uintptr_t;
#endif #endif
#include "hash.h" #include "hash.h"
#include "Str.h" #include "Str.h"
@@ -14,14 +14,22 @@ typedef unsigned int uintptr_t;
#include "gcmain.c" #include "gcmain.c"
/* *INDENT-OFF* */
defhash(HashItem_ss *, int, hss_i) defhash(HashItem_ss *, int, hss_i)
/* *INDENT-ON* */
#define keycomp(x,y) ((x)==(y)) #define keycomp(x,y) ((x)==(y))
static uintptr_t hashfunc(HashItem_ss * x)
static uintptr_t
hashfunc(HashItem_ss * x)
{ {
return (uintptr_t) x; return (uintptr_t) x;
} }
/* *INDENT-OFF* */
defhashfunc(HashItem_ss *, int, hss_i) defhashfunc(HashItem_ss *, int, hss_i)
/* *INDENT-ON* */
int int
MAIN(int argc, char *argv[], char **envp) MAIN(int argc, char *argv[], char **envp)
{ {