2001-03-22 Marcus G. Daniels <mgd@swarm.org>

[pf3gnuchains/gcc-fork.git] / libjava / no-threads.cc

diff --git a/libjava/no-threads.cc b/libjava/no-threads.cc
index d6e0298..d28891a 100644 (file)
--- a/libjava/no-threads.cc
+++ b/libjava/no-threads.cc
@@ -1,6 +1,6 @@
 // no-thread.cc - Implementation of `no threads' threads.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -10,7 +10,7 @@ details.  */
 
 #include <config.h>
 
-#include <cni.h>
+#include <gcj/cni.h>
 #include <jvm.h>
 #include <java/lang/Thread.h>
 
@@ -20,7 +20,10 @@ void
 _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *,
                 _Jv_ThreadStartFunc *meth)
 {
-  JvAssert (! _Jv_OnlyThread);
+  // Don't use JvAssert, since we want this to fail even when compiled
+  // without assertions.
+  if (_Jv_OnlyThread)
+    JvFail ("only thread already running");
   _Jv_OnlyThread = thread;
   (*meth) (thread);
 }