[vmkit-commits] [vmkit] r54912 - in /vmkit/trunk/lib/JnJVM/VMCore: Jnjvm.cpp Jnjvm.h

[Nicolas Geoffray]

Author: geoffray
Date: Mon Aug 18 03:22:05 2008
New Revision: 54912

URL: http://llvm.org/viewvc/llvm-project?rev=54912&view=rev
Log:
Make the nativeLibs static in a non mulit-vm environment, 
so that the vmkit command line tool does not complain of
not finding a native function.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h

Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=54912&r1=54911&r2=54912&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Mon Aug 18 03:22:05 2008
@@ -80,6 +80,11 @@
 const char* Jnjvm::envSeparator = ":";
 const unsigned int Jnjvm::Magic = 0xcafebabe;
 
+#ifndef MULTIPLE_VM
+/// If we're not in a multi-vm environment, this can be made static.
+std::vector<void*> Jnjvm::nativeLibs;
+#endif
+
 typedef void (*clinit_t)(Jnjvm* vm);
 
 void Jnjvm::initialiseClass(CommonClass* cl) {

Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h?rev=54912&r1=54911&r2=54912&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.h Mon Aug 18 03:22:05 2008
@@ -245,6 +245,9 @@
 
   /// nativeLibs - Native libraries (e.g. '.so') loaded by this JVM.
   ///
+#ifndef MULTIPLE_VM
+  static
+#endif
   std::vector<void*> nativeLibs;
 
   /// classpath - The CLASSPATH value, or the paths given in command line.