Changeset 767 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Jun 9, 2016, 2:21:26 PM (8 years ago)

Author:

djay

Message:

Fix issue with headers located in extern C. Define java.library.path at runtime to search for libZOO.so from the Java zoo-api.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -34 +34 @@
 #include "cgic.h"
 
-extern "C"
-{
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
@@ -41 +39 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
-}
 
 #include "ulinet.h"
@@ -1722 +1719 @@
 #ifndef WIN32
           setenv (mapcs->name, mapcs->value, 1);
-#else
 #ifdef DEBUG
           fprintf (stderr, "[ZOO: setenv (%s=%s)]\n", mapcs->name,
                    mapcs->value);
 #endif
+#else
           if (mapcs->value[strlen (mapcs->value) - 2] == '\r')
             {
@@ -1746 +1743 @@
             }
 #else
-
-
           SetEnvironmentVariable (mapcs->name, mapcs->value);
 #endif