Fixed problems in public headers.

src/dsql/sqlda_pub.h

@@ -26,11 +26,9 @@
 
 /* Definitions for DSQL free_statement routine */
 
-#ifndef DSQL_close
 #define DSQL_close		1
 #define DSQL_drop		2
 #define DSQL_unprepare	4
-#endif
 
 /* Declare the extended SQLDA */
 

src/include/fb_types.h

@@ -145,7 +145,6 @@ typedef IPTR FB_THREAD_ID;
 
 /* Number of elements in an array */
 #define FB_NELEM(x)	((int)(sizeof(x) / sizeof(x[0])))
-#define FB_ALIGN(n, b) ((n + b - 1) & ~(b - 1))
 
 // Intl types
 typedef SSHORT CHARSET_ID;

src/include/firebird/ExternalEngine.h

@@ -33,8 +33,6 @@
 #include "./Plugin.h"
 #include "./Provider.h"
 
-#include "firebird.h" //// FIXME:
-
 namespace Firebird {
 
 class ExternalEngine;

src/include/firebird/Interface.h

@@ -29,7 +29,7 @@
 #ifndef FB_INCLUDE_INTERFACE
 #define FB_INCLUDE_INTERFACE
 
-#include "types_pub.h"	//// FIXME:
+#include "ibase.h"
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
 #	define FB_CARG __cdecl

src/include/firebird/Message.h

@@ -25,6 +25,7 @@
 
 #include "ibase.h"
 #include "firebird/impl/boost/preprocessor/seq/for_each_i.hpp"
+#include <string.h>
 
 #define FB_MESSAGE(name, fields)	\
 	FB_MESSAGE_I(name, FB_BOOST_PP_CAT(FB_MESSAGE_X fields, 0))

src/include/firebird/Provider.h

@@ -148,13 +148,6 @@ public:
 };
 #define FB_STATEMENT_VERSION (FB_REFCOUNTED_VERSION + 12)
 
-#ifndef DSQL_close
-// TODO: avoid code duplication
-#define DSQL_close		1
-#define DSQL_drop		2
-#define DSQL_unprepare	4
-#endif
-
 class IRequest : public IRefCounted
 {
 public:

src/include/ibase.h

@@ -1 +1,7 @@
+#ifdef FB_COMPILING_WHY_CPP
+#include "../common/common.h"
+#include "../dsql/sqlda_pub.h"
+#include "../yvalve/why_proto.h"
+#else
 #include "../jrd/ibase.h"
+#endif

src/include/types_pub.h

@@ -45,6 +45,8 @@ typedef unsigned long uintptr_t;
 
 #endif
 
+#define FB_ALIGN(n, b) ((n + b - 1) & ~(b - 1))
+
 /******************************************************************/
 /* API handles                                                    */
 /******************************************************************/

src/yvalve/why.cpp

@@ -27,6 +27,8 @@
  *
  */
 
+#define FB_COMPILING_WHY_CPP
+
 #include "firebird.h"
 #include "firebird/Provider.h"
 #include "memory_routines.h"