am 813a3a2d: Merge "If dalvik wants ASCII casing, it needs to ask for it."

[android-x86/dalvik.git] / vm / Init.h

diff --git a/vm/Init.h b/vm/Init.h
index ef56f26..1b585fa 100644 (file)
--- a/vm/Init.h
+++ b/vm/Init.h
@@ -17,14 +17,14 @@
 /*
  * VM initialization and shutdown.
  */
-#ifndef _DALVIK_INIT
-#define _DALVIK_INIT
+#ifndef DALVIK_INIT_H_
+#define DALVIK_INIT_H_
 
 /*
  * Standard VM initialization, usually invoked through JNI.
  */
-int dvmStartup(int argc, const char* const argv[], bool ignoreUnrecognized,
-    JNIEnv* pEnv);
+std::string dvmStartup(int argc, const char* const argv[],
+        bool ignoreUnrecognized, JNIEnv* pEnv);
 void dvmShutdown(void);
 bool dvmInitAfterZygote(void);
 
@@ -58,15 +58,6 @@ bool dvmFindRequiredClassesAndMembers(void);
  */
 bool dvmFindReferenceMembers(ClassObject* classReference);
 
-typedef void ObjectReferenceCallback(Object** pReference);
-
-/*
- * Perform a callback on each of the object references used directly
- * by the VM. The value passed into the callback is a pointer to where
- * the reference is stored.
- */
-void dvmForEachRequiredReference(ObjectReferenceCallback* callback);
-
 /*
  * Replacement for fprintf() when we want to send a message to the console.
  * This defaults to fprintf(), but will use the JNI fprintf callback if
@@ -78,4 +69,4 @@ int dvmFprintf(FILE* fp, const char* format, ...)
 #endif
     ;
 
-#endif /*_DALVIK_INIT*/
+#endif  // DALVIK_INIT_H_