From 27fa5d48537c89e4ebb709075e343f68531191f3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Oct 2004 15:13:06 +0000 Subject: [PATCH] AIX compile fixes ndb/include/kernel/signaldata/UpgradeStartup.hpp: Forward declaration ndb/include/ndb_global.h: Fix for AIX ndb/include/ndb_types.h: Always use ndb_global instead of my_global (or anything else) ndb/include/ndbapi/Ndb.hpp: Forward declaration ndb/include/ndbapi/NdbReceiver.hpp: Forward declaration ndb/include/ndbapi/NdbScanOperation.hpp: Forward declaration ndb/src/common/util/ConfigValues.cpp: Always use ndb_global instead of my_global (or anything else) ndb/src/kernel/blocks/backup/restore/Restore.hpp: Forward declaration ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Move read/update function into Dbtup ndb/src/mgmsrv/SignalQueue.cpp: Always use ndb_global instead of my_global (or anything else) ndb/tools/waiter.cpp: Always use ndb_global instead of my_global (or anything else) --- ndb/include/kernel/signaldata/UpgradeStartup.hpp | 2 ++ ndb/include/ndb_global.h | 3 +++ ndb/include/ndb_types.h | 2 +- ndb/include/ndbapi/Ndb.hpp | 1 + ndb/include/ndbapi/NdbReceiver.hpp | 2 ++ ndb/include/ndbapi/NdbScanOperation.hpp | 1 + ndb/src/common/util/ConfigValues.cpp | 7 ++----- ndb/src/kernel/blocks/backup/restore/Restore.hpp | 2 +- ndb/src/kernel/blocks/dbtup/Dbtup.hpp | 16 ++++++++-------- ndb/src/mgmsrv/SignalQueue.cpp | 3 +-- ndb/tools/waiter.cpp | 2 +- 11 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ndb/include/kernel/signaldata/UpgradeStartup.hpp b/ndb/include/kernel/signaldata/UpgradeStartup.hpp index badc7ca0e4d..a4450221c59 100644 --- a/ndb/include/kernel/signaldata/UpgradeStartup.hpp +++ b/ndb/include/kernel/signaldata/UpgradeStartup.hpp @@ -1,6 +1,8 @@ #ifndef NDB_UPGRADE_STARTUP #define NDB_UPGRADE_STARTUP +class Ndbcntr; + struct UpgradeStartup { static void installEXEC(SimulatedBlock*); diff --git a/ndb/include/ndb_global.h b/ndb/include/ndb_global.h index 3ce37a2edee..c128323241a 100644 --- a/ndb/include/ndb_global.h +++ b/ndb/include/ndb_global.h @@ -13,6 +13,9 @@ #undef NDB_WIN32 #endif +#ifdef _AIX +#undef _H_STRINGS +#endif #include #include #include diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h index 87ebd3d6c6b..a2988dbae78 100644 --- a/ndb/include/ndb_types.h +++ b/ndb/include/ndb_types.h @@ -33,7 +33,7 @@ typedef unsigned int UintR; #ifdef __SIZE_TYPE__ typedef __SIZE_TYPE__ UintPtr; #else -#include +#include #ifdef HAVE_STDINT_H #include #endif diff --git a/ndb/include/ndbapi/Ndb.hpp b/ndb/include/ndbapi/Ndb.hpp index 134a48e1d6d..5ec09269695 100644 --- a/ndb/include/ndbapi/Ndb.hpp +++ b/ndb/include/ndbapi/Ndb.hpp @@ -881,6 +881,7 @@ class Table; class BaseString; class NdbEventOperation; class NdbBlob; +class NdbReceiver; typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*); diff --git a/ndb/include/ndbapi/NdbReceiver.hpp b/ndb/include/ndbapi/NdbReceiver.hpp index 6f577380728..b95313db274 100644 --- a/ndb/include/ndbapi/NdbReceiver.hpp +++ b/ndb/include/ndbapi/NdbReceiver.hpp @@ -22,6 +22,8 @@ #include class Ndb; +class NdbConnection; + class NdbReceiver { friend class Ndb; diff --git a/ndb/include/ndbapi/NdbScanOperation.hpp b/ndb/include/ndbapi/NdbScanOperation.hpp index a1c66b380a7..2e4d173ac75 100644 --- a/ndb/include/ndbapi/NdbScanOperation.hpp +++ b/ndb/include/ndbapi/NdbScanOperation.hpp @@ -32,6 +32,7 @@ #include class NdbBlob; +class NdbResultSet; /** * @class NdbScanOperation diff --git a/ndb/src/common/util/ConfigValues.cpp b/ndb/src/common/util/ConfigValues.cpp index 8a14882550c..5c4b17c73ca 100644 --- a/ndb/src/common/util/ConfigValues.cpp +++ b/ndb/src/common/util/ConfigValues.cpp @@ -1,9 +1,6 @@ + +#include #include -#include -#include -#include -#include -#include #include #include diff --git a/ndb/src/kernel/blocks/backup/restore/Restore.hpp b/ndb/src/kernel/blocks/backup/restore/Restore.hpp index 8ca68fd9b23..0ec1ab852e9 100644 --- a/ndb/src/kernel/blocks/backup/restore/Restore.hpp +++ b/ndb/src/kernel/blocks/backup/restore/Restore.hpp @@ -91,7 +91,7 @@ class TupleS { private: friend class RestoreDataIterator; - TableS *m_currentTable; + class TableS *m_currentTable; AttributeData *allAttrData; bool prepareRecord(TableS &); diff --git a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp index 0e8dd5fbbe8..55ad1d0910a 100644 --- a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp +++ b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp @@ -35,14 +35,6 @@ #define ZMIN_PAGE_LIMIT_TUPKEYREQ 5 #define ZTUP_VERSION_BITS 15 -typedef bool (Dbtup::* ReadFunction)(Uint32*, - AttributeHeader*, - Uint32, - Uint32); -typedef bool (Dbtup::* UpdateFunction)(Uint32*, - Uint32, - Uint32); - #ifdef DBTUP_C //------------------------------------------------------------------ // Jam Handling: @@ -351,6 +343,14 @@ typedef bool (Dbtup::* UpdateFunction)(Uint32*, class Dbtup: public SimulatedBlock { public: + + typedef bool (Dbtup::* ReadFunction)(Uint32*, + AttributeHeader*, + Uint32, + Uint32); + typedef bool (Dbtup::* UpdateFunction)(Uint32*, + Uint32, + Uint32); // State values enum State { NOT_INITIALIZED = 0, diff --git a/ndb/src/mgmsrv/SignalQueue.cpp b/ndb/src/mgmsrv/SignalQueue.cpp index 7003f5c0a89..08ad5f363a6 100644 --- a/ndb/src/mgmsrv/SignalQueue.cpp +++ b/ndb/src/mgmsrv/SignalQueue.cpp @@ -14,8 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include - +#include #include "SignalQueue.hpp" SignalQueue::SignalQueue() { diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp index c27b46c9356..6dcea6ccc48 100644 --- a/ndb/tools/waiter.cpp +++ b/ndb/tools/waiter.cpp @@ -15,8 +15,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include -#include #include #include #include