commit bd86bccf1b47f1151842152ee52cf5d46d6b34ab
author Brian Carlstrom <bdc@google.com> Sun Mar 10 20:26:16 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Mar 11 15:47:02 2013 -0700
tree c0c110b47435c6e8548f1b7126f9ea20da7fd934
parent 5d021c7399fa8090910d5b47ed00465a4e0e7e0f

Tracking rebase to jb-mr1-release

Change-Id: Ic2ae1a27682cc4152003a68d59068b2c5c5eb09b

src/runtime.h

diff --git a/src/runtime.h b/src/runtime.h
index 696f231..f8788ad 100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -126,7 +126,7 @@
   }
 
   // Starts a runtime, which may cause threads to be started and code to run.
-  void Start() UNLOCK_FUNCTION(Locks::mutator_lock_);
+  bool Start() UNLOCK_FUNCTION(Locks::mutator_lock_);
 
   bool IsShuttingDown() const EXCLUSIVE_LOCKS_REQUIRED(Locks::runtime_shutdown_lock_) {
     return shutting_down_;
@@ -346,8 +346,9 @@
 
   void SetStatsEnabled(bool new_state);
 
-  void DidForkFromZygote();
   bool PreZygoteFork();
+  bool InitZygote();
+  void DidForkFromZygote();
 
   void EnableMethodTracing(Trace* trace);
   void DisableMethodTracing();