summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1cb0c62)
raw | patch | inline | side by side (parent: 1cb0c62)
author | joncruz <joncruz@users.sourceforge.net> | |
Mon, 10 Mar 2008 08:18:59 +0000 (08:18 +0000) | ||
committer | joncruz <joncruz@users.sourceforge.net> | |
Mon, 10 Mar 2008 08:18:59 +0000 (08:18 +0000) |
src/bind/javabind.cpp | patch | blob | history |
diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index 2710efcda49d259ed321ab481b23599ec282e5ca..1786dc731a0cf8a164933469350142cc92238793 100644 (file)
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
/**
* This is a simple mechanism to bind Inkscape to Java, and thence
- * to all of the nice things that can be layered upon that.
+ * to all of the nice things that can be layered upon that.
*
* Authors:
* Bob Jamison
#include <errno.h>
#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
#include "javabind.h"
#include "javabind-private.h"
#include <path-prefix.h>
char verbuf[16];
char regpath[80];
strcpy(regpath, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
- bool ret = getRegistryString(HKEY_LOCAL_MACHINE,
+ bool ret = getRegistryString(HKEY_LOCAL_MACHINE,
regpath, "CurrentVersion", verbuf, 15);
if (!ret)
{
strcat(regpath, verbuf);
//msg("reg path: %s\n", regpath);
char libname[80];
- ret = getRegistryString(HKEY_LOCAL_MACHINE,
+ ret = getRegistryString(HKEY_LOCAL_MACHINE,
regpath, "RuntimeLib", libname, 79);
if (!ret)
{
/**
* Recursively descend into a directory looking for libjvm.so
- */
+ */
static bool findJVMRecursive(const String &dirpath,
std::vector<String> &results)
{
if (finfo.st_mode & S_IFDIR)
{
ret |= findJVMRecursive(path, results);
- }
+ }
}
closedir(dir);
return ret;
/**
* Look for a Java VM (libjvm.so) in several Unix places
- */
+ */
static bool findJVM(String &result)
{
std::vector<String> results;
cp.append(path);
}
closedir(dir);
-
+
result = cp;
return;