Fixes for HPUX.

From-SVN: r155550

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 0834d035cd4326c77fec70511039074ab06d7778..86cf4147998fa44337a9c6cf5769ae4ab07615e4 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+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*.

diff --git a/libffi/testsuite/libffi.call/ffitest.h b/libffi/testsuite/libffi.call/ffitest.h
index a54b2146f9c8a2d900d2cc40e064a7c6229a7fc6..7b1c5efa5cee25ceb81ce16bd10ee52fdd338b44 100644 (file)
--- 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 723871626d180c73171e312a4f61738b09fdca72..d7ffd4aa21477d87e5dfb6d9ad6d2c65e4adc4dc 100644 (file)
--- 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__,