Module Name: src
Committed By: matt
Date: Wed Aug 13 19:48:17 UTC 2014
Modified Files:
src/sys/arch/alpha/include: int_fmtio.h
src/sys/arch/arm/include: int_fmtio.h
src/sys/arch/hppa/include: int_fmtio.h
src/sys/arch/ia64/include: int_fmtio.h
src/sys/arch/m68k/include: int_fmtio.h
src/sys/arch/mips/include: int_fmtio.h
src/sys/arch/powerpc/include: int_fmtio.h
src/sys/arch/sh3/include: int_fmtio.h
src/sys/arch/sparc/include: int_fmtio.h
src/sys/arch/vax/include: int_fmtio.h
Log Message:
include <sys/common_int_fmtio.h> if __INTPTR_FMTd__ is defined
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/include/int_fmtio.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/int_fmtio.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/int_fmtio.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/int_fmtio.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/include/int_fmtio.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/include/int_fmtio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/int_fmtio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sh3/include/int_fmtio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc/include/int_fmtio.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/include/int_fmtio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/int_fmtio.h
diff -u src/sys/arch/alpha/include/int_fmtio.h:1.4 src/sys/arch/alpha/include/int_fmtio.h:1.5
--- src/sys/arch/alpha/include/int_fmtio.h:1.4 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.4 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _ALPHA_INT_FMTIO_H_
#define _ALPHA_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -209,4 +212,6 @@
#define SCNxMAX "lx" /* uintmax_t */
#define SCNxPTR "lx" /* uintptr_t */
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_ALPHA_INT_FMTIO_H_ */
Index: src/sys/arch/arm/include/int_fmtio.h
diff -u src/sys/arch/arm/include/int_fmtio.h:1.8 src/sys/arch/arm/include/int_fmtio.h:1.9
--- src/sys/arch/arm/include/int_fmtio.h:1.8 Fri Jul 25 21:43:13 2014
+++ src/sys/arch/arm/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.8 2014/07/25 21:43:13 joerg Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.9 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -210,6 +210,7 @@
#define SCNxFAST64 "llx" /* uint_fast64_t */
#define SCNxMAX "llx" /* uintmax_t */
#define SCNxPTR "lx" /* uintptr_t */
-#endif
+
+#endif /* !__INTPTR_FMTd__ */
#endif /* !_ARM_INT_FMTIO_H_ */
Index: src/sys/arch/hppa/include/int_fmtio.h
diff -u src/sys/arch/hppa/include/int_fmtio.h:1.2 src/sys/arch/hppa/include/int_fmtio.h:1.3
--- src/sys/arch/hppa/include/int_fmtio.h:1.2 Mon Apr 28 20:23:23 2008
+++ src/sys/arch/hppa/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.2 2008/04/28 20:23:23 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.3 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _HPPA_INT_FMTIO_H_
#define _HPPA_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -209,4 +212,6 @@
#define SCNxMAX "llx" /* uintmax_t */
#define SCNxPTR "lx" /* uintptr_t */
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_HPPA_INT_FMTIO_H_ */
Index: src/sys/arch/ia64/include/int_fmtio.h
diff -u src/sys/arch/ia64/include/int_fmtio.h:1.2 src/sys/arch/ia64/include/int_fmtio.h:1.3
--- src/sys/arch/ia64/include/int_fmtio.h:1.2 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/ia64/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.2 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.3 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _IA64_INT_FMTIO_H_
#define _IA64_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -209,4 +212,6 @@
#define SCNxMAX "lx" /* uintmax_t */
#define SCNxPTR "lx" /* uintptr_t */
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_IA64_INT_FMTIO_H_ */
Index: src/sys/arch/m68k/include/int_fmtio.h
diff -u src/sys/arch/m68k/include/int_fmtio.h:1.3 src/sys/arch/m68k/include/int_fmtio.h:1.4
--- src/sys/arch/m68k/include/int_fmtio.h:1.3 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/m68k/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.3 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.4 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _M68K_INT_FMTIO_H_
#define _M68K_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -209,4 +212,6 @@
#define SCNxMAX "llx" /* uintmax_t */
#define SCNxPTR "x" /* uintptr_t */
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_M68K_INT_FMTIO_H_ */
Index: src/sys/arch/mips/include/int_fmtio.h
diff -u src/sys/arch/mips/include/int_fmtio.h:1.5 src/sys/arch/mips/include/int_fmtio.h:1.6
--- src/sys/arch/mips/include/int_fmtio.h:1.5 Mon Dec 14 00:46:04 2009
+++ src/sys/arch/mips/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.5 2009/12/14 00:46:04 matt Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.6 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _MIPS_INT_FMTIO_H_
#define _MIPS_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -399,4 +402,6 @@
#define SCNxPTR "x" /* uintptr_t */
#endif
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_MIPS_INT_FMTIO_H_ */
Index: src/sys/arch/powerpc/include/int_fmtio.h
diff -u src/sys/arch/powerpc/include/int_fmtio.h:1.4 src/sys/arch/powerpc/include/int_fmtio.h:1.5
--- src/sys/arch/powerpc/include/int_fmtio.h:1.4 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.4 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _POWERPC_INT_FMTIO_H_
#define _POWERPC_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -366,4 +369,6 @@
#define SCNxPTR "x" /* uintptr_t */
#endif
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_POWERPC_INT_FMTIO_H_ */
Index: src/sys/arch/sh3/include/int_fmtio.h
diff -u src/sys/arch/sh3/include/int_fmtio.h:1.4 src/sys/arch/sh3/include/int_fmtio.h:1.5
--- src/sys/arch/sh3/include/int_fmtio.h:1.4 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sh3/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.4 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _SH3_INT_FMTIO_H_
#define _SH3_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -209,4 +212,6 @@
#define SCNxMAX "llx" /* uintmax_t */
#define SCNxPTR "x" /* uintptr_t */
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_SH3_INT_FMTIO_H_ */
Index: src/sys/arch/sparc/include/int_fmtio.h
diff -u src/sys/arch/sparc/include/int_fmtio.h:1.4 src/sys/arch/sparc/include/int_fmtio.h:1.5
--- src/sys/arch/sparc/include/int_fmtio.h:1.4 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.4 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _SPARC_INT_FMTIO_H_
#define _SPARC_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -406,4 +409,6 @@
#endif
#define SCNxPTR "lx" /* uintptr_t */
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_SPARC_INT_FMTIO_H_ */
Index: src/sys/arch/vax/include/int_fmtio.h
diff -u src/sys/arch/vax/include/int_fmtio.h:1.4 src/sys/arch/vax/include/int_fmtio.h:1.5
--- src/sys/arch/vax/include/int_fmtio.h:1.4 Fri Aug 29 18:25:01 2008
+++ src/sys/arch/vax/include/int_fmtio.h Wed Aug 13 19:48:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: int_fmtio.h,v 1.4 2008/08/29 18:25:01 matt Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.5 2014/08/13 19:48:17 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _VAX_INT_FMTIO_H_
#define _VAX_INT_FMTIO_H_
+#ifdef __INTPTR_FMTd__
+#include <sys/common_int_fmtio.h>
+#else
/*
* 7.8.1 Macros for format specifiers
*/
@@ -209,4 +212,6 @@
#define SCNxMAX "llx" /* uintmax_t */
#define SCNxPTR "lx" /* uintptr_t */
+#endif /* !__INTPTR_FMTd__ */
+
#endif /* !_VAX_INT_FMTIO_H_ */
