Commit 27fa5d48 authored by unknown's avatar unknown
Browse files

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)
parent 76b09dd5

ndb/include/kernel/signaldata/UpgradeStartup.hpp

+2 −0
Original line number Diff line number Diff line 
#ifndef NDB_UPGRADE_STARTUP

#define NDB_UPGRADE_STARTUP



class Ndbcntr;



struct UpgradeStartup {



  static void installEXEC(SimulatedBlock*);

ndb/include/ndb_global.h

+3 −0
Original line number Diff line number Diff line
@@ -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>

ndb/include/ndb_types.h

+1 −1
Original line number Diff line number Diff line
@@ -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

ndb/include/ndbapi/Ndb.hpp

+1 −0
Original line number Diff line number Diff line
@@ -881,6 +881,7 @@ class Table; 
class BaseString;

class NdbEventOperation;

class NdbBlob;

class NdbReceiver;



typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);

ndb/include/ndbapi/NdbReceiver.hpp

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <ndb_global.h>



class Ndb;

class NdbConnection;



class NdbReceiver

{

  friend class Ndb;