aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Tobler <a.tobler@schweiz.org>2010-01-01 12:36:07 +0000
committerAnthony Green <green@gcc.gnu.org>2010-01-01 12:36:07 +0000
commitd7e9538ee51eb9b7d00235a13770f56b9ceab6b7 (patch)
treeab511afe23f236b67be82d22ce429cf911770592
parentcb14fcb8788b639e1fe718a81bb4109230ad6d77 (diff)
downloadgcc-d7e9538ee51eb9b7d00235a13770f56b9ceab6b7.zip
gcc-d7e9538ee51eb9b7d00235a13770f56b9ceab6b7.tar.gz
gcc-d7e9538ee51eb9b7d00235a13770f56b9ceab6b7.tar.bz2
Fixes for HPUX.
From-SVN: r155550
-rw-r--r--libffi/ChangeLog6
-rw-r--r--libffi/testsuite/libffi.call/ffitest.h10
-rw-r--r--libffi/testsuite/libffi.special/unwindtest.cc7
3 files changed, 21 insertions, 2 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 0834d03..86cf414 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,5 +1,11 @@
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.
+
+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
diff --git a/libffi/testsuite/libffi.call/ffitest.h b/libffi/testsuite/libffi.call/ffitest.h
index a54b214..7b1c5ef 100644
--- a/libffi/testsuite/libffi.call/ffitest.h
+++ b/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
diff --git a/libffi/testsuite/libffi.special/unwindtest.cc b/libffi/testsuite/libffi.special/unwindtest.cc
index 7238716..d7ffd4a 100644
--- a/libffi/testsuite/libffi.special/unwindtest.cc
+++ b/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__,