4 files changed, 5 insertions, 14 deletions
diff --git a/sigchainlib/sigchain.cc b/sigchainlib/sigchain.cc
index 50bfe70..7539990 100644
--- a/sigchainlib/sigchain.cc
+++ b/sigchainlib/sigchain.cc
@@ -28,6 +28,7 @@
 
 #if defined(__APPLE__)
 #define _NSIG NSIG
+#define sighandler_t sig_t
 #endif
 
 namespace art {
diff --git a/test/004-SignalTest2/expected.txt b/test/004-SignalTest2/expected.txt
index fd5ec00..6a3072c 100644
--- a/test/004-SignalTest2/expected.txt
+++ b/test/004-SignalTest2/expected.txt
@@ -1,5 +1,4 @@
 init signal test
 Caught NullPointerException
-Caught StackOverflowError
 signal caught
 Signal test OK
diff --git a/test/004-SignalTest2/signaltest.cc b/test/004-SignalTest2/signaltest.cc
index 47b1eb6..4d0ee11 100644
--- a/test/004-SignalTest2/signaltest.cc
+++ b/test/004-SignalTest2/signaltest.cc
@@ -23,6 +23,10 @@
 
 #include <sys/ucontext.h>
 
+#if defined(__APPLE__)
+#define sighandler_t sig_t
+#endif
+
 static int signal_count;
 static const int kMaxSignal = 2;
 
diff --git a/test/004-SignalTest2/src/Main.java b/test/004-SignalTest2/src/Main.java
index 7799e8c..1537091 100644
--- a/test/004-SignalTest2/src/Main.java
+++ b/test/004-SignalTest2/src/Main.java
@@ -18,10 +18,6 @@ public class Main {
     private static native void initSignalTest2();
     private static native void testSignal2();
 
-    private static void stackOverflow() {
-       stackOverflow();
-    }
-
     public static void main(String[] args) {
         System.loadLibrary("arttest");
 
@@ -37,15 +33,6 @@ public class Main {
         } catch (NullPointerException e) {
             System.out.println("Caught NullPointerException");
         }
-        try {
-            stackOverflow();
-
-            // Should never get here.
-            throw new AssertionError();
-        } catch (StackOverflowError e) {
-            System.out.println("Caught StackOverflowError");
-        }
-
         // Test that a signal in native code works.
         testSignal2();
     }