From bffb7353560d33413d143b736bbb722149e76d51 Mon Sep 17 00:00:00 2001
From: matthew <>
Date: Tue, 11 Jun 2013 15:59:16 +0000
Subject: [PATCH] Contrary to C99's advice, C++ TR1 and C++ 11 require that
 <inttypes.h> and <stdint.h> should unconditionally define all of their macros
 regardless of whether the __STDC_*_MACROS macros are defined.

ok guenther, espie
bulk build tested by landry
---
 src/include/inttypes.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/include/inttypes.h b/src/include/inttypes.h
index 8e26c3bf..2b410419 100644
--- a/src/include/inttypes.h
+++ b/src/include/inttypes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inttypes.h,v 1.10 2009/01/13 18:13:51 kettenis Exp $	*/
+/*	$OpenBSD: inttypes.h,v 1.11 2013/06/11 15:59:16 matthew Exp $	*/
 
 /*
  * Copyright (c) 1997, 2005 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -25,7 +25,6 @@
 #define __wchar_t	wchar_t
 #endif
 
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)
 /*
  * 7.8.1 Macros for format specifiers
  *
@@ -244,8 +243,6 @@
 #define	SCNxMAX			"jx"		/* uintmax_t */
 #define	SCNxPTR			"lx"		/* uintptr_t */
 
-#endif /* __cplusplus || __STDC_FORMAT_MACROS */
-
 typedef struct {
 	intmax_t quot;		/* quotient */
 	intmax_t rem;		/* remainder */