Move v3 public include files to src/include/firebird.

2025-01-22 18:43:02 +01:00 · 2011-06-02 15:57:08 +00:00 · 2011-06-02 15:57:08 +00:00 · 5ffa6c77c8
commit 5ffa6c77c8
parent be635fd1db
37 changed files with 49 additions and 52 deletions
--- a/examples/udr/UdrCppExample.cpp
+++ b/examples/udr/UdrCppExample.cpp
@ -21,7 +21,7 @@
 */

 #include "ibase.h"
-#include "FirebirdUdrCpp.h"
+#include "firebird/UdrCppEngine.h"
 #include <assert.h>
 #include <stdio.h>

--- a/src/auth/AuthInterface.h
+++ b/src/auth/AuthInterface.h
@ -29,7 +29,7 @@
 #ifndef FB_AUTH_INTERFACE
 #define FB_AUTH_INTERFACE

-#include "FirebirdPluginApi.h"
+#include "firebird/Plugin.h"

 namespace Firebird {
 class IStatus;
--- a/src/auth/SecurityDatabase/LegacyManagement.epp
+++ b/src/auth/SecurityDatabase/LegacyManagement.epp
@ -40,7 +40,7 @@
 #include "../auth/SecurityDatabase/LegacyManagement.h"
 #include "../common/classes/ImplementHelper.h"
 #include "../common/classes/ClumpletWriter.h"
-#include "FirebirdPluginApi.h"
+#include "firebird/Plugin.h"

 // Here we use version-independent symbolic link (or copy) of actual database
 DATABASE database = STATIC FILENAME "security.fdb";
--- a/src/auth/SecurityDatabase/LegacyServer.cpp
+++ b/src/auth/SecurityDatabase/LegacyServer.cpp
@ -43,7 +43,7 @@
 #include "../common/classes/objects_array.h"
 #include "../common/classes/init.h"
 #include "../common/classes/ImplementHelper.h"
-#include "Timer.h"
+#include "firebird/Timer.h"

 using namespace Firebird;

--- a/src/auth/trusted/AuthSspi.cpp
+++ b/src/auth/trusted/AuthSspi.cpp
@ -30,7 +30,7 @@
 #ifdef TRUSTED_AUTH

 #include "../common/classes/ClumpletReader.h"
-#include "Interface.h"
+#include "firebird/Interface.h"
 #include "../common/classes/ImplementHelper.h"

 using namespace Firebird;
--- a/src/common/StatementMetadata.h
+++ b/src/common/StatementMetadata.h
@ -24,7 +24,7 @@
 #ifndef COMMON_STATEMENT_METADATA_H
 #define COMMON_STATEMENT_METADATA_H

-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include "iberror.h"
 #include "../common/classes/Nullable.h"
 #include "../common/classes/array.h"
--- a/src/common/StatusHolder.h
+++ b/src/common/StatusHolder.h
@ -29,7 +29,7 @@
 #ifndef FB_STATUS_HOLDER
 #define FB_STATUS_HOLDER

-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include "../common/utils_proto.h"
 #include "../common/classes/ImplementHelper.h"

--- a/src/common/classes/ImplementHelper.h
+++ b/src/common/classes/ImplementHelper.h
@ -29,9 +29,9 @@
 #ifndef FB_COMMON_CLASSES_IMPLEMENT_HELPER
 #define FB_COMMON_CLASSES_IMPLEMENT_HELPER

-#include "FirebirdPluginApi.h"
-#include "Timer.h"
-#include "ProviderInterface.h"
+#include "firebird/Plugin.h"
+#include "firebird/Timer.h"
+#include "firebird/Provider.h"
 #include "../common/classes/alloc.h"
 #include "gen/iberror.h"
 #include "../yvalve/gds_proto.h"
--- a/src/common/config/config.cpp
+++ b/src/common/config/config.cpp
@ -28,7 +28,7 @@
 #include "../common/classes/init.h"
 #include "../common/dllinst.h"
 #include "../common/os/fbsyslog.h"
-#include "FirebirdPluginApi.h"
+#include "firebird/Plugin.h"

 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
--- a/src/common/fb_exception.cpp
+++ b/src/common/fb_exception.cpp
@ -1,6 +1,6 @@
 #include "firebird.h"

-#include "ProviderInterface.h"
+#include "firebird/Provider.h"

 #include <string.h>
 #include <errno.h>
--- a/src/common/utils_proto.h
+++ b/src/common/utils_proto.h
@ -33,7 +33,7 @@
 #include "../common/classes/fb_string.h"
 #include "../common/classes/array.h"
 #include "gen/iberror.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"

 #ifdef SFIO
 #include <stdio.h>
--- a/src/gpre/boot/gpre_meta_boot.cpp
+++ b/src/gpre/boot/gpre_meta_boot.cpp
@ -670,7 +670,7 @@ bool MET_trigger_exists(gpre_dbb* /*db*/, const TEXT* /*trigger_name*/)
 	return false;
 }

-#include "Interface.h"
+#include "firebird/Interface.h"

 using namespace Firebird;

--- a/src/include/firebird/ExternalEngine.h
+++ b/src/include/firebird/ExternalEngine.h
@ -30,8 +30,8 @@
 #define FIREBIRD_EXTERNAL_API_H

 #include "FirebirdApi.h"
-#include "FirebirdPluginApi.h"
-#include "ProviderInterface.h"
+#include "./Plugin.h"
+#include "./Provider.h"


 namespace Firebird {
--- a/src/include/firebird/Interface.h
+++ b/src/include/firebird/Interface.h
@ -1,6 +1,6 @@
 /*
 *	PROGRAM:		Firebird interface.
- *	MODULE:			Interface.h
+ *	MODULE:			firebird/Interface.h
 *	DESCRIPTION:	Base class for all FB interfaces / plugins.
 *
 *  The contents of this file are subject to the Initial
@ -29,7 +29,7 @@
 #ifndef FB_INCLUDE_INTERFACE
 #define FB_INCLUDE_INTERFACE

-#include "types_pub.h"
+#include "types_pub.h"	//// FIXME:

 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 #	define FB_CARG __cdecl
--- a/src/include/FirebirdPluginApi.h
+++ b/src/include/FirebirdPluginApi.h
@ -62,7 +62,7 @@
 #ifndef FIREBIRD_PLUGIN_API_H
 #define FIREBIRD_PLUGIN_API_H

-#include "Interface.h"
+#include "./Interface.h"

 #define FB_PLUGIN_ENTRY_POINT		firebird_plugin

--- a/src/include/firebird/Provider.h
+++ b/src/include/firebird/Provider.h
@ -1,6 +1,6 @@
 /*
 *	PROGRAM:		Firebird basic API
- *	MODULE:			YValveInterface.h
+ *	MODULE:			YValvefirebird/Interface.h
 *	DESCRIPTION:	Interfaces, used by yValve
 *
 *  The contents of this file are subject to the Initial
@ -29,8 +29,8 @@
 #ifndef FB_PROVIDER_INTERFACE
 #define FB_PROVIDER_INTERFACE

-#include "firebird.h"
-#include "FirebirdPluginApi.h"
+#include "firebird.h"	//// FIXME:
+#include "./Plugin.h"

 namespace Firebird {

--- a/src/include/firebird/Timer.h
+++ b/src/include/firebird/Timer.h
@ -1,6 +1,6 @@
 /*
 *	PROGRAM:		Firebird interface.
- *	MODULE:			Timer.h
+ *	MODULE:			firebird/Timer.h
 *	DESCRIPTION:	Timer interface defnition.
 *
 *  The contents of this file are subject to the Initial
@ -29,7 +29,7 @@
 #ifndef FIREBIRD_TIMER_H
 #define FIREBIRD_TIMER_H

-#include "Interface.h"
+#include "./Interface.h"

 namespace Firebird {

--- a/src/include/firebird/UdrCppEngine.h
+++ b/src/include/firebird/UdrCppEngine.h
@ -23,9 +23,8 @@
 #ifndef FIREBIRD_PLUGIN_UDR_CPP
 #define FIREBIRD_PLUGIN_UDR_CPP

-#include "FirebirdApi.h"
-#include "FirebirdExternalApi.h"
-#include "FirebirdUdr.h"
+#include "./ExternalEngine.h"
+#include "./UdrEngine.h"
 #ifndef JRD_IBASE_H
 #include "ibase.h"
 #include "iberror.h"
--- a/src/include/firebird/UdrEngine.h
+++ b/src/include/firebird/UdrEngine.h
@ -23,8 +23,7 @@
 #ifndef FIREBIRD_UDR_H
 #define FIREBIRD_UDR_H

-#include "FirebirdApi.h"
-#include "FirebirdExternalApi.h"
+#include "./ExternalEngine.h"


 namespace Firebird
--- a/src/jrd/EngineInterface.h
+++ b/src/jrd/EngineInterface.h
@ -23,7 +23,7 @@
 #ifndef JRD_ENGINE_INTERFACE_H
 #define JRD_ENGINE_INTERFACE_H

-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include "../common/classes/ImplementHelper.h"
 #include "../common/StatementMetadata.h"
 #include "../common/classes/RefCounted.h"
--- a/src/jrd/ErrorImpl.h
+++ b/src/jrd/ErrorImpl.h
@ -30,7 +30,7 @@
 #define JRD_ERROR_IMPL_H

 #include "FirebirdApi.h"
-#include "FirebirdExternalApi.h"
+#include "firebird/ExternalEngine.h"
 #include "iberror.h"

 namespace Jrd {
--- a/src/jrd/ExtEngineManager.h
+++ b/src/jrd/ExtEngineManager.h
@ -24,7 +24,7 @@
 #define JRD_EXT_ENGINE_MANAGER_H

 #include "FirebirdApi.h"
-#include "FirebirdExternalApi.h"
+#include "firebird/ExternalEngine.h"
 #include "../common/common.h"
 #include "../common/classes/array.h"
 #include "../common/classes/fb_string.h"
--- a/src/jrd/blb.h
+++ b/src/jrd/blb.h
@ -32,7 +32,7 @@
 #include "../common/classes/array.h"
 #include "../common/classes/File.h"

-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include "../common/classes/ImplementHelper.h"
 namespace Jrd {

--- a/src/jrd/event.h
+++ b/src/jrd/event.h
@ -29,7 +29,7 @@
 #include "../common/isc_s_proto.h"
 #include "../common/file_params.h"
 #include "../jrd/que.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"

 // Global section header

--- a/src/jrd/jrd.h
+++ b/src/jrd/jrd.h
@ -57,7 +57,7 @@
 #include "../jrd/scl.h"
 #include "../jrd/Routine.h"
 #include "../jrd/ExtEngineManager.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"

 #ifdef DEV_BUILD
 //#define DEBUG                   if (debug) DBG_supervisor(debug);
--- a/src/jrd/ntrace.h
+++ b/src/jrd/ntrace.h
@ -30,7 +30,7 @@
 #ifndef FIREBIRD_NTRACE_H
 #define FIREBIRD_NTRACE_H

-#include "FirebirdPluginApi.h"
+#include "firebird/Plugin.h"
 #include "../common/common.h"		// to define SINT64

 // Database objects
--- a/src/plugins/udr_engine/UdrEngine.cpp
+++ b/src/plugins/udr_engine/UdrEngine.cpp
@ -22,11 +22,10 @@

 #include "firebird.h"
 #include "../jrd/ibase.h"
-#include "FirebirdUdr.h"
-#include "FirebirdUdrCpp.h"
-#include "FirebirdPluginApi.h"
-#include "FirebirdApi.h"
-#include "FirebirdExternalApi.h"
+#include "firebird/UdrEngine.h"
+#include "firebird/UdrCppEngine.h"
+#include "firebird/Plugin.h"
+#include "firebird/ExternalEngine.h"
 #include "../common/classes/alloc.h"
 #include "../common/classes/array.h"
 #include "../common/classes/init.h"
--- a/src/remote/client/interface.cpp
+++ b/src/remote/client/interface.cpp
@ -63,7 +63,7 @@
 #include "../common/classes/DbImplementation.h"
 #include "../common/Auth.h"
 #include "../common/classes/GetPlugins.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include "../common/StatementMetadata.h"

 #include "../auth/SecurityDatabase/LegacyClient.h"
--- a/src/remote/remote.cpp
+++ b/src/remote/remote.cpp
@ -35,7 +35,7 @@
 #include "../jrd/thread_proto.h"
 #include "../common/config/config.h"
 #include "../common/classes/init.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"

 #ifdef DEV_BUILD
 Firebird::AtomicCounter rem_port::portCounter;
--- a/src/remote/server/os/posix/inet_server.cpp
+++ b/src/remote/server/os/posix/inet_server.cpp
@ -87,7 +87,7 @@
 #include "../common/utils_proto.h"
 #include "../common/classes/fb_string.h"

-#include "FirebirdPluginApi.h"
+#include "firebird/Plugin.h"
 #include "../common/classes/ImplementHelper.h"
 #include "../auth/SecurityDatabase/LegacyServer.h"
 #include "../auth/trusted/AuthSspi.h"
--- a/src/remote/server/os/win32/srvr_w32.cpp
+++ b/src/remote/server/os/win32/srvr_w32.cpp
@ -107,7 +107,7 @@
 #include "../remote/os/win32/xnet_proto.h"
 #include "../yvalve/gds_proto.h"

-#include "FirebirdPluginApi.h"
+#include "firebird/Plugin.h"
 #include "../common/classes/ImplementHelper.h"
 #include "../auth/trusted/AuthSspi.h"
 #include "../auth/SecurityDatabase/LegacyServer.h"
--- a/src/yvalve/MasterImplementation.cpp
+++ b/src/yvalve/MasterImplementation.cpp
@ -27,8 +27,8 @@
 */

 #include "firebird.h"
-#include "Interface.h"
-#include "Timer.h"
+#include "firebird/Interface.h"
+#include "firebird/Timer.h"

 #include "../yvalve/MasterImplementation.h"
 #include "../common/classes/init.h"
--- a/src/yvalve/MasterImplementation.h
+++ b/src/yvalve/MasterImplementation.h
@ -30,7 +30,7 @@
 #define YVALVE_MASTER_IMPLEMENTATION_H

 #include "firebird.h"
-#include "Interface.h"
+#include "firebird/Interface.h"
 #include "../yvalve/YObjects.h"
 #include "../common/classes/ImplementHelper.h"

--- a/src/yvalve/PluginManager.h
+++ b/src/yvalve/PluginManager.h
@ -23,7 +23,7 @@
 #ifndef YVALVE_PLUGIN_MANAGER_H
 #define YVALVE_PLUGIN_MANAGER_H

-#include "FirebirdPluginApi.h"
+#include "firebird/Plugin.h"
 #include "../common/classes/ImplementHelper.h"

 #include "../common/common.h"
--- a/src/yvalve/YObjects.h
+++ b/src/yvalve/YObjects.h
@ -27,7 +27,7 @@
 #define YVALVE_Y_OBJECTS_H

 #include "firebird.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include "gen/iberror.h"
 #include "../common/common.h"
 #include "../common/StatusHolder.h"
--- a/src/yvalve/gds.cpp
+++ b/src/yvalve/gds.cpp
@ -36,7 +36,7 @@
 //#define ISC_TIME_SECONDS_PRECISION_SCALE	-4

 #include "firebird.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/src/yvalve/why.cpp
+++ b/src/yvalve/why.cpp
@ -28,7 +28,7 @@
 */

 #include "firebird.h"
-#include "ProviderInterface.h"
+#include "firebird/Provider.h"
 #include "memory_routines.h"
 #include "gen/iberror.h"
 #include "gen/msg_facs.h"