x86-64: adjust recently added tests

[binutils-gdb.git] / bfd / bfd-in.h

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 6f72cc4539bbd5ddcaba824e77b4f57aab163445..a4888f9f7f2d625139a512125e0445adf816cc2a 100644 (file)
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -78,23 +78,7 @@ typedef BFD_HOST_64_BIT bfd_int64_t;
 typedef BFD_HOST_U_64_BIT bfd_uint64_t;
 #endif
 
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if BFD_HOST_64BIT_LONG
-#  define BFD_PRI64 "l"
-# elif defined (__MSVCRT__)
-#  define BFD_PRI64 "I64"
-# else
-#  define BFD_PRI64 "ll"
-# endif
-# undef PRId64
-# define PRId64 BFD_PRI64 "d"
-# undef PRIu64
-# define PRIu64 BFD_PRI64 "u"
-# undef PRIx64
-# define PRIx64 BFD_PRI64 "x"
-#endif
+#include <inttypes.h>
 
 #if BFD_ARCH_SIZE >= 64
 #define BFD64
@@ -120,7 +104,7 @@ typedef struct bfd bfd;
    success and FALSE on failure (unless they're a predicate).  */
 
 #ifdef POISON_BFD_BOOLEAN
-# pragma GCC poison bfd_boolean FALSE TRUE
+# pragma GCC poison bfd_boolean
 #else
 # define bfd_boolean bool
 # undef FALSE