===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/inttypes.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/include/inttypes.h	2006/01/13 17:58:09	1.7
--- src/include/inttypes.h	2006/01/15 00:46:07	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: inttypes.h,v 1.7 2006/01/13 17:58:09 millert Exp $	*/
  
  /*
   * Copyright (c) 1997, 2005 Todd C. Miller <Todd.Miller@courtesan.com>
--- 1,4 ----
! /*	$OpenBSD: inttypes.h,v 1.8 2006/01/15 00:46:07 millert Exp $	*/
  
  /*
   * Copyright (c) 1997, 2005 Todd C. Miller <Todd.Miller@courtesan.com>
***************
*** 55,65 ****
  #define	PRIdFAST64		"lld"
  
  #define	PRIdMAX			"jd"
- #ifdef __LP64__
  #define	PRIdPTR			"ld"
- #else
- #define	PRIdPTR			"d"
- #endif
  
  #define	PRIi8			"i"
  #define	PRIi16			"i"
--- 55,61 ----
***************
*** 77,87 ****
  #define	PRIiFAST64		"lli"
  
  #define	PRIiMAX			"ji"
- #ifdef __LP64__
  #define	PRIiPTR			"li"
- #else
- #define	PRIiPTR			"i"
- #endif
  
  /* fprintf macros for unsigned integers */
  #define	PRIo8			"o"
--- 73,79 ----
***************
*** 100,110 ****
  #define	PRIoFAST64		"llo"
  
  #define	PRIoMAX			"jo"
- #ifdef __LP64__
  #define	PRIoPTR			"lo"
- #else
- #define	PRIoPTR			"o"
- #endif
  
  #define	PRIu8			"u"
  #define	PRIu16			"u"
--- 92,98 ----
***************
*** 122,132 ****
  #define	PRIuFAST64		"llu"
  
  #define	PRIuMAX			"ju"
- #ifdef __LP64__
  #define	PRIuPTR			"lu"
- #else
- #define	PRIuPTR			"u"
- #endif
  
  #define	PRIx8			"x"
  #define	PRIx16			"x"
--- 110,116 ----
***************
*** 144,154 ****
  #define	PRIxFAST64		"llx"
  
  #define	PRIxMAX			"jx"
- #ifdef __LP64__
  #define	PRIxPTR			"lx"
- #else
- #define	PRIxPTR			"x"
- #endif
  
  #define	PRIX8			"X"
  #define	PRIX16			"X"
--- 128,134 ----
***************
*** 166,176 ****
  #define	PRIXFAST64		"llX"
  
  #define	PRIXMAX			"jX"
- #ifdef __LP64__
  #define	PRIXPTR			"lX"
- #else
- #define	PRIXPTR			"X"
- #endif
  
  /* fscanf macros for signed integers */
  #define	SCNd8			"hhd"
--- 146,152 ----
***************
*** 189,199 ****
  #define	SCNdFAST64		"lld"
  
  #define	SCNdMAX			"jd"
- #ifdef __LP64__
  #define	SCNdPTR			"ld"
- #else
- #define	SCNdPTR			"d"
- #endif
  
  #define	SCNi8			"hhi"
  #define	SCNi16			"hi"
--- 165,171 ----
***************
*** 211,221 ****
  #define	SCNiFAST64		"lli"
  
  #define	SCNiMAX			"ji"
- #ifdef __LP64__
  #define	SCNiPTR			"li"
- #else
- #define	SCNiPTR			"i"
- #endif
  
  /* fscanf macros for unsigned integers */
  #define	SCNo8			"hho"
--- 183,189 ----
***************
*** 234,244 ****
  #define	SCNoFAST64		"llo"
  
  #define	SCNoMAX			"jo"
- #ifdef __LP64__
  #define	SCNoPTR			"lo"
- #else
- #define	SCNoPTR			"o"
- #endif
  
  #define	SCNu8			"hhu"
  #define	SCNu16			"hu"
--- 202,208 ----
***************
*** 256,266 ****
  #define	SCNuFAST64		"llu"
  
  #define	SCNuMAX			"ju"
- #ifdef __LP64__
  #define	SCNuPTR			"lu"
- #else
- #define	SCNuPTR			"u"
- #endif
  
  #define	SCNx8			"hhx"
  #define	SCNx16			"hx"
--- 220,226 ----
***************
*** 278,288 ****
  #define	SCNxFAST64		"llx"
  
  #define	SCNxMAX			"jx"
- #ifdef __LP64__
  #define	SCNxPTR			"lx"
- #else
- #define	SCNxPTR			"x"
- #endif
  
  #endif /* __cplusplus || __STDC_FORMAT_MACROS */
  
--- 238,244 ----