Reset quilt patches post 3.0.9 merge with GCC

2010-01-01 08:08:02 -05:00
parent b0304e9679
commit c3042afaf3
125 changed files with 1264 additions and 83871 deletions
--- a/testsuite/libffi.special/.svn/text-base/ffitestcxx.h.svn-base
+++ b/testsuite/libffi.special/.svn/text-base/ffitestcxx.h.svn-base
@@ -45,9 +45,9 @@


 /* MinGW kludge.  */
-#ifdef WIN64
-#define PRIdLL "PRId64"
-#define PRIuLL "PRIu64"
+#ifdef _WIN64
+#define PRIdLL "I64d"
+#define PRIuLL "I64u"
 #else
 #define PRIdLL "lld"
 #define PRIuLL "llu"
--- a/testsuite/libffi.special/.svn/text-base/unwindtest.cc.svn-base
+++ b/testsuite/libffi.special/.svn/text-base/unwindtest.cc.svn-base
@@ -6,7 +6,14 @@

 /* { dg-do run } */
 #include "ffitestcxx.h"
+
+#if defined HAVE_STDINT_H
 #include <stdint.h>
+#endif
+
+#if defined HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif

 void
 closure_test_fn(ffi_cif* cif __UNUSED__, void* resp __UNUSED__,