|
From: <asf...@us...> - 2009-06-11 21:33:04
|
Revision: 929
http://firebird.svn.sourceforge.net/firebird/?rev=929&view=rev
Author: asfernandes
Date: 2009-06-11 21:33:03 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Changes to Jaybird native code
Modified Paths:
--------------
java-plugin/trunk/src/native/jaygds/source/external/ib_util.h
java-plugin/trunk/src/native/jaygds/source/generic_unix/platform.h
java-plugin/trunk/src/native/jaygds/source/interface_manager.cpp
java-plugin/trunk/src/native/jaygds/source/locks.h
java-plugin/trunk/src/native/jaygds/source/solaris/platform.h
java-plugin/trunk/src/native/jaygds/source/win32/platform.h
Modified: java-plugin/trunk/src/native/jaygds/source/external/ib_util.h
===================================================================
--- java-plugin/trunk/src/native/jaygds/source/external/ib_util.h 2009-06-11 21:30:13 UTC (rev 928)
+++ java-plugin/trunk/src/native/jaygds/source/external/ib_util.h 2009-06-11 21:33:03 UTC (rev 929)
@@ -24,6 +24,14 @@
#ifndef _IB_UTIL_H
#define _IB_UTIL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern void *ib_util_malloc(long);
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
#endif /* _IB_UTIL_H */
Modified: java-plugin/trunk/src/native/jaygds/source/generic_unix/platform.h
===================================================================
--- java-plugin/trunk/src/native/jaygds/source/generic_unix/platform.h 2009-06-11 21:30:13 UTC (rev 928)
+++ java-plugin/trunk/src/native/jaygds/source/generic_unix/platform.h 2009-06-11 21:33:03 UTC (rev 929)
@@ -47,6 +47,13 @@
void PlatformUnLoadLibrary(SHARED_LIBRARY_HANDLE);
+template <typename T> T PlatformFindSymbol(SHARED_LIBRARY_HANDLE library,
+ const char* symbolName, T& pointer)
+{
+ pointer = reinterpret_cast<T>(dlsym(library, symbolName));
+ return pointer;
+}
+
#define OFFSETA(struct, fld) ((size_t) ((struct) NULL)->fld)
#define DEF_CALL_API(X) \
Modified: java-plugin/trunk/src/native/jaygds/source/interface_manager.cpp
===================================================================
--- java-plugin/trunk/src/native/jaygds/source/interface_manager.cpp 2009-06-11 21:30:13 UTC (rev 928)
+++ java-plugin/trunk/src/native/jaygds/source/interface_manager.cpp 2009-06-11 21:33:03 UTC (rev 929)
@@ -115,7 +115,7 @@
SHARED_LIBRARY_HANDLE InterfaceManager::loadLibrary(const char *libName)
{
- return PlatformLoadLibrary(libName);
+ return PlatformLoadLibrary(libName[0] ? libName : NULL);
}
Modified: java-plugin/trunk/src/native/jaygds/source/locks.h
===================================================================
--- java-plugin/trunk/src/native/jaygds/source/locks.h 2009-06-11 21:30:13 UTC (rev 928)
+++ java-plugin/trunk/src/native/jaygds/source/locks.h 2009-06-11 21:33:03 UTC (rev 929)
@@ -31,7 +31,7 @@
#ifndef CLASSES_LOCKS_H
#define CLASSES_LOCKS_H
-
+//// FIXME: MULTI_THREAD is never defined
#ifdef MULTI_THREAD
#ifdef WIN_NT
// It is relatively easy to avoid using this header. Maybe do the same stuff like
Modified: java-plugin/trunk/src/native/jaygds/source/solaris/platform.h
===================================================================
--- java-plugin/trunk/src/native/jaygds/source/solaris/platform.h 2009-06-11 21:30:13 UTC (rev 928)
+++ java-plugin/trunk/src/native/jaygds/source/solaris/platform.h 2009-06-11 21:33:03 UTC (rev 929)
@@ -46,6 +46,13 @@
void PlatformUnLoadLibrary(SHARED_LIBRARY_HANDLE);
+template <typename T> T PlatformFindSymbol(SHARED_LIBRARY_HANDLE library,
+ const char* symbolName, T& pointer)
+{
+ pointer = reinterpret_cast<T>(dlsym(library, symbolName));
+ return pointer;
+}
+
#define OFFSETA(struct, fld) ((size_t) ((struct) NULL)->fld)
#define DEF_CALL_API(X) \
Modified: java-plugin/trunk/src/native/jaygds/source/win32/platform.h
===================================================================
--- java-plugin/trunk/src/native/jaygds/source/win32/platform.h 2009-06-11 21:30:13 UTC (rev 928)
+++ java-plugin/trunk/src/native/jaygds/source/win32/platform.h 2009-06-11 21:33:03 UTC (rev 929)
@@ -62,6 +62,13 @@
void PlatformUnLoadLibrary(SHARED_LIBRARY_HANDLE);
+template <typename T> T PlatformFindSymbol(SHARED_LIBRARY_HANDLE library,
+ const char* symbolName, T& pointer)
+{
+ pointer = reinterpret_cast<T>(GetProcAddress(library, symbolName));
+ return pointer;
+}
+
#define OFFSETA(struct, fld) ((size_t) ((struct) NULL)->fld)
#define DEF_CALL_API(X) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|