* src/cacao/cacao.cpp (main) [ENABLE_LIBJVM]: Removed const from path.

* src/vmcore/os.cpp (os_access) [extern "C"]: New function.
* src/vmcore/os.hpp (os): Added malloc.
(system_malloc): Renamed to os::malloc.

diff --git a/src/cacao/cacao.cpp b/src/cacao/cacao.cpp
index 6730c01e4085c9658d60a1f4a463323ab903c1c8..4ec3c526417418d0e8231e0f8d0113af92b5405a 100644 (file)
--- a/src/cacao/cacao.cpp
+++ b/src/cacao/cacao.cpp
@@ -70,7 +70,7 @@ static JavaVMInitArgs* prepare_options(int argc, char** argv);
 int main(int argc, char **argv)
 {
 #if defined(ENABLE_LIBJVM)
-       const char* path;
+       char* path;
 
 # if defined(ENABLE_JRE_LAYOUT)
        int         len;
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 # if defined(ENABLE_JRE_LAYOUT)
        /* SUN also uses a buffer of 4096-bytes (strace is your friend). */
 
-       path = malloc(sizeof(char) * 4096);
+       path = (char*) os::malloc(sizeof(char) * 4096);
 
        if (readlink("/proc/self/exe", path, 4095) == -1) {
                fprintf(stderr, "main: readlink failed: %s\n", strerror(errno));
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 
        strcat(path, "/../lib/"LIBJVM_NAME);
 # else
-       path = CACAO_LIBDIR"/"LIBJVM_NAME;
+       path = (char*) CACAO_LIBDIR"/"LIBJVM_NAME;
 # endif
 
        /* First try to open where dlopen searches, e.g. LD_LIBRARY_PATH.

diff --git a/src/vmcore/os.cpp b/src/vmcore/os.cpp
index fe0822877d4fb4a480f6dcd3182beea60038cc6e..f14c508c82c6c0d0e6140a64a4de98aca0b41445 100644 (file)
--- a/src/vmcore/os.cpp
+++ b/src/vmcore/os.cpp
@@ -162,6 +162,7 @@ extern "C" {
        void*  os_mmap_anonymous(void *addr, size_t len, int prot, int flags) { return os::mmap_anonymous(addr, len, prot, flags); }
 
        void   os_abort(void) { os::abort(); }
+       int    os_access(const char* pathname, int mode) { return os::access(pathname, mode); }
        int    os_atoi(const char* nptr) { return os::atoi(nptr); }
        void*  os_calloc(size_t nmemb, size_t size) { return os::calloc(nmemb, size); }
 #if defined(ENABLE_JRE_LAYOUT)

diff --git a/src/vmcore/os.hpp b/src/vmcore/os.hpp
index 3c9f5ac45ed578cd706b68a1399c9f0767a59ebd..63156bb2da5440bd3989eaa55e9189452aa49e9b 100644 (file)
--- a/src/vmcore/os.hpp
+++ b/src/vmcore/os.hpp
@@ -115,6 +115,7 @@ public:
        static inline int    getsockname(int s, struct sockaddr* name, socklen_t* namelen);
        static inline int    getsockopt(int s, int level, int optname, void* optval, socklen_t* optlen);
        static inline int    listen(int sockfd, int backlog);
+       static inline void*  malloc(size_t size);
        static inline void*  memcpy(void* dest, const void* src, size_t n);
        static inline void*  memset(void* s, int c, size_t n);
        static inline int    mprotect(void* addr, size_t len, int prot);
@@ -352,10 +353,10 @@ inline static off_t system_lseek(int fildes, off_t offset, int whence)
 #endif
 }
 
-inline static void *system_malloc(size_t size)
+inline void* os::malloc(size_t size)
 {
 #if defined(HAVE_MALLOC)
-       return malloc(size);
+       return ::malloc(size);
 #else
 # error malloc not available
 #endif
@@ -527,6 +528,7 @@ inline static ssize_t system_write(int fd, const void *buf, size_t count)
 void*  os_mmap_anonymous(void *addr, size_t len, int prot, int flags);
 
 void   os_abort(void);
+int    os_access(const char* pathname, int mode);
 int    os_atoi(const char* nptr);
 void*  os_calloc(size_t nmemb, size_t size);
 char*  os_dirname(char* path);