diff options
| author | unknown <knielsen@mysql.com> | 2006-01-01 22:18:02 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-01 22:18:02 +0100 |
| commit | ff8458c5893f5c178a0bb40f4b6d7dc7e11dbf8f (patch) | |
| tree | 8499113b6d43827ef0ca7362c2a49a14e7bcb0c7 | |
| parent | bb1e8bd5e423e729bed411789359bb7b04eb8c6c (diff) | |
| download | mariadb-git-ff8458c5893f5c178a0bb40f4b6d7dc7e11dbf8f.tar.gz | |
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...)
| -rw-r--r-- | include/my_bitmap.h | 2 | ||||
| -rw-r--r-- | sql/rpl_tblmap.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/my_bitmap.h b/include/my_bitmap.h index 33cd61de8a0..8afeb1b8107 100644 --- a/include/my_bitmap.h +++ b/include/my_bitmap.h @@ -17,7 +17,9 @@ #ifndef _my_bitmap_h_ #define _my_bitmap_h_ +#ifdef THREAD #include <my_pthread.h> +#endif #define MY_BIT_NONE (~(uint) 0) diff --git a/sql/rpl_tblmap.h b/sql/rpl_tblmap.h index cfc2d7c2c6c..23864bd329e 100644 --- a/sql/rpl_tblmap.h +++ b/sql/rpl_tblmap.h @@ -54,10 +54,6 @@ private: public: - enum { - NO_TABLE = ULONG_MAX - }; - enum enum_error { ERR_NO_ERROR = 0, ERR_LIMIT_EXCEEDED, |