diff options
| author | Sergey Skvortsov <skv@FreeBSD.org> | 2006-09-18 15:20:04 +0000 |
|---|---|---|
| committer | Sergey Skvortsov <skv@FreeBSD.org> | 2006-09-18 15:20:04 +0000 |
| commit | 3eeac24355d0de977cf350af1bdfa888aebc282c (patch) | |
| tree | 5d537ad4b12e17d2a074d9e1d207eb471058b506 /databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp | |
| parent | Update to 4.0.2091. This version finally works again on FreeBSD \o/ (diff) | |
Add Firebird 2.0.0 (RC4)
Notes
Notes:
svn path=/head/; revision=173329
Diffstat (limited to 'databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp')
| -rw-r--r-- | databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp b/databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp index 808568121478..7a2ffab72408 100644 --- a/databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp +++ b/databases/firebird2-server/files/patch-src%jrd%plugin_manager.cpp @@ -1,24 +1,20 @@ ---- src/jrd/plugin_manager.cpp.orig Wed Mar 15 14:25:42 2006 -+++ src/jrd/plugin_manager.cpp Wed Mar 15 14:39:12 2006 -@@ -47,9 +47,7 @@ +--- src/jrd/plugin_manager.cpp.orig Tue Aug 15 23:11:04 2006 ++++ src/jrd/plugin_manager.cpp Tue Aug 15 23:12:01 2006 +@@ -64,7 +64,7 @@ void PluginManager::loadAllPlugins() { - Firebird::list<Path>::iterator pathItr; -- char fb_lib_path[MAXPATHLEN]; -- gds__prefix(fb_lib_path, ""); -- Firebird::string fbLibPath(fb_lib_path); -+ Firebird::string fbLibPath(FB_LIBEXEC_PREFIX); - Firebird::string checkDir; + Firebird::PathName checkDir; +- const Firebird::PathName fbLibPath = Config::getRootDirectory(); ++ const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX; - for(pathItr = searchPaths.begin(); pathItr != searchPaths.end(); ++pathItr) -@@ -114,9 +112,7 @@ - - PluginManager::Module *PluginManager::loadPluginModule(const Firebird::string& name) + for (spIterator pathItr = searchPaths.begin(); pathItr != searchPaths.end(); ++pathItr) + { +@@ -131,7 +131,7 @@ + PluginManager::Module *PluginManager::loadPluginModule(const Firebird::PathName& name) { -- char fb_lib_path[MAXPATHLEN]; -- gds__prefix(fb_lib_path, ""); -- Firebird::string fbLibPath(fb_lib_path); -+ Firebird::string fbLibPath(FB_LIBEXEC_PREFIX); - Firebird::string checkPath; - Firebird::list<Path>::iterator itr; + Firebird::PathName checkPath; +- const Firebird::PathName fbLibPath = Config::getRootDirectory(); ++ const Firebird::PathName fbLibPath = FB_LIBEXEC_PREFIX; + // Check to see if the module name was specified as a relative path + // from one of our search paths. This only makes sense if the name |