Compile fixes for aix52-64bit.
include/my_bitmap.h: Protect incluce of my_pthread.h with #ifdef THREAD, to make it work in non-thread environment. sql/rpl_tblmap.h: Remove unused NO_TABLE enum which broke compilation on picky compilers (trying to put ULONG_MAX into an int...)
This commit is contained in:
parent
bb1e8bd5e4
commit
ff8458c589
@ -17,7 +17,9 @@
|
|||||||
#ifndef _my_bitmap_h_
|
#ifndef _my_bitmap_h_
|
||||||
#define _my_bitmap_h_
|
#define _my_bitmap_h_
|
||||||
|
|
||||||
|
#ifdef THREAD
|
||||||
#include <my_pthread.h>
|
#include <my_pthread.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define MY_BIT_NONE (~(uint) 0)
|
#define MY_BIT_NONE (~(uint) 0)
|
||||||
|
|
||||||
|
@ -54,10 +54,6 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
enum {
|
|
||||||
NO_TABLE = ULONG_MAX
|
|
||||||
};
|
|
||||||
|
|
||||||
enum enum_error {
|
enum enum_error {
|
||||||
ERR_NO_ERROR = 0,
|
ERR_NO_ERROR = 0,
|
||||||
ERR_LIMIT_EXCEEDED,
|
ERR_LIMIT_EXCEEDED,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user