Permalink
Switch branches/tags
Nothing to show
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
75 lines (67 sloc) 2.07 KB
Index: libffi/ChangeLog.libffi
===================================================================
--- libffi.orig/ChangeLog.libffi
+++ libffi/ChangeLog.libffi
@@ -1,5 +1,13 @@
2009-12-26 Andreas Tobler <a.tobler@schweiz.org>
+ * testsuite/libffi.call/ffitest.h: Conditionally include stdint.h
+ and inttypes.h.
+ * testsuite/libffi.special/unwindtest.cc: Ditto.
+ * testsuite/libffi.call/huge_struct.c: Don't include stdint.h
+ directly.
+
+2009-12-26 Andreas Tobler <a.tobler@schweiz.org>
+
* configure.ac: Add amd64-*-openbsd*.
* configure: Rebuilt.
* testsuite/lib/libffi-dg.exp (libffi_target_compile): Link
Index: libffi/testsuite/libffi.call/ffitest.h
===================================================================
--- libffi.orig/testsuite/libffi.call/ffitest.h
+++ libffi/testsuite/libffi.call/ffitest.h
@@ -2,11 +2,17 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <stdint.h>
-#include <inttypes.h>
#include <ffi.h>
#include "fficonfig.h"
+#if defined HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#if defined HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
#define MAX_ARGS 256
#define CHECK(x) !(x) ? abort() : 0
Index: libffi/testsuite/libffi.call/huge_struct.c
===================================================================
--- libffi.orig/testsuite/libffi.call/huge_struct.c
+++ libffi/testsuite/libffi.call/huge_struct.c
@@ -10,8 +10,6 @@
/* { dg-options -mlong-double-128 { target powerpc64*-*-* } } */
/* { dg-output "" { xfail avr32-*-* x86_64-*-mingw* x86_64-*-cygwin* } } */
-#include <stdint.h>
-
#include "ffitest.h"
typedef struct BigStruct{
Index: libffi/testsuite/libffi.special/unwindtest.cc
===================================================================
--- libffi.orig/testsuite/libffi.special/unwindtest.cc
+++ libffi/testsuite/libffi.special/unwindtest.cc
@@ -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__,