diff options
| author | unknown <joreland@mysql.com> | 2004-05-27 10:26:56 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-05-27 10:26:56 +0200 |
| commit | 6cb6ddf39a76caa34254ce11ef92bbe2a534e10d (patch) | |
| tree | c093b3a701a7664403e7122ffb976f3e200973fd /ndb/include | |
| parent | 9933c7e7aa16717a4327d1a980d61745428ac713 (diff) | |
| parent | aacffd9dbbc7d1ff03bf29a32931841a809891dc (diff) | |
| download | mariadb-git-6cb6ddf39a76caa34254ce11ef92bbe2a534e10d.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/ndbapi/NdbConnection.hpp | 4 | ||||
| -rw-r--r-- | ndb/include/ndbapi/NdbOperation.hpp | 5 | ||||
| -rw-r--r-- | ndb/include/ndbapi/NdbReceiver.hpp | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/ndb/include/ndbapi/NdbConnection.hpp b/ndb/include/ndbapi/NdbConnection.hpp index 89786f63cc5..d8c395162f6 100644 --- a/ndb/include/ndbapi/NdbConnection.hpp +++ b/ndb/include/ndbapi/NdbConnection.hpp @@ -755,6 +755,10 @@ NdbConnection::set_send_size(Uint32 send_size) return; } +#ifdef NDB_NO_DROPPED_SIGNAL +#include <stdlib.h> +#endif + inline int NdbConnection::checkMagicNumber() diff --git a/ndb/include/ndbapi/NdbOperation.hpp b/ndb/include/ndbapi/NdbOperation.hpp index e772a30f571..5fa903994b7 100644 --- a/ndb/include/ndbapi/NdbOperation.hpp +++ b/ndb/include/ndbapi/NdbOperation.hpp @@ -1098,6 +1098,11 @@ protected: }; +#ifdef NDB_NO_DROPPED_SIGNAL +#include <stdlib.h> +#endif + + inline int NdbOperation::checkMagicNumber() diff --git a/ndb/include/ndbapi/NdbReceiver.hpp b/ndb/include/ndbapi/NdbReceiver.hpp index bc11207a112..a1a08a9735a 100644 --- a/ndb/include/ndbapi/NdbReceiver.hpp +++ b/ndb/include/ndbapi/NdbReceiver.hpp @@ -56,6 +56,10 @@ private: void* m_owner; }; +#ifdef NDB_NO_DROPPED_SIGNAL +#include <stdlib.h> +#endif + inline bool NdbReceiver::checkMagicNumber() const { |