Reset quilt patches post 3.0.9 merge with GCC

testsuite/libffi.special/.svn/entries

@@ -1,7 +1,7 @@
 10
 
 dir
-155499
+155537
 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/libffi.special
 svn+ssh://green@gcc.gnu.org/svn/gcc
 
@@ -62,15 +62,15 @@ daney
 
 unwindtest.cc
 file
+155550
 
 
 
-
-2009-12-20T06:01:58.002569Z
-c5774898ee6afc81a2f2f50ef5a63b69
-2009-06-12T15:57:58.721771Z
-148433
-aph
+2010-01-01T12:33:04.510072Z
+93fc3ea311b79f64004992807ce75d1e
+2010-01-01T12:36:07.805985Z
+155550
+green
 
 
 
@@ -92,7 +92,7 @@ aph
 
 
 
-3711
+3803
 
 special.exp
 file
@@ -130,15 +130,15 @@ jakub
 
 ffitestcxx.h
 file
+155540
 
 
 
-
-2009-12-20T06:01:58.002569Z
-bf9da8a285fef56aae7657c0982b9b8b
-2009-06-16T10:15:31.432585Z
-148521
-aph
+2009-12-31T17:36:45.977318Z
+c6b374a7b78e1a90bd6e5d1386c4d57a
+2009-12-31T17:44:32.724697Z
+155540
+green
 
 
 
@@ -160,5 +160,5 @@ aph
 
 
 
-1725
+1722
 

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"

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__,