diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-22 15:13:06 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-22 15:13:06 +0000 |
| commit | 27fa5d48537c89e4ebb709075e343f68531191f3 (patch) | |
| tree | 970f1db953c94bd1c912f55e5a0f962292ac854e /ndb/include | |
| parent | 76b09dd518af0bd480cc00538fc51c5a83d4d23a (diff) | |
| download | mariadb-git-27fa5d48537c89e4ebb709075e343f68531191f3.tar.gz | |
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)
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/kernel/signaldata/UpgradeStartup.hpp | 2 | ||||
| -rw-r--r-- | ndb/include/ndb_global.h | 3 | ||||
| -rw-r--r-- | ndb/include/ndb_types.h | 2 | ||||
| -rw-r--r-- | ndb/include/ndbapi/Ndb.hpp | 1 | ||||
| -rw-r--r-- | ndb/include/ndbapi/NdbReceiver.hpp | 2 | ||||
| -rw-r--r-- | ndb/include/ndbapi/NdbScanOperation.hpp | 1 |
6 files changed, 10 insertions, 1 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 <m_string.h> #include <m_ctype.h> #include <ndb_types.h> 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 <my_global.h> +#include <ndb_global.h> #ifdef HAVE_STDINT_H #include <stdint.h> #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 <ndb_global.h> 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 <NdbOperation.hpp> class NdbBlob; +class NdbResultSet; /** * @class NdbScanOperation |