diff options
| -rw-r--r-- | include/lf.h | 1 | ||||
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | mysys/lf_alloc-pin.c | 1 | ||||
| -rw-r--r-- | mysys/lf_hash.c | 1 | ||||
| -rw-r--r-- | mysys/my_fopen.c | 1 | ||||
| -rw-r--r-- | mysys/my_open.c | 1 | ||||
| -rw-r--r-- | mysys/waiting_threads.c | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 1 | ||||
| -rw-r--r-- | sql/xa.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/include/srv0mon.h | 1 | ||||
| -rw-r--r-- | storage/maria/lockman.c | 1 | ||||
| -rw-r--r-- | unittest/mysys/my_atomic-t.c | 1 |
13 files changed, 11 insertions, 3 deletions
diff --git a/include/lf.h b/include/lf.h index 933eb4938f8..88ac644c349 100644 --- a/include/lf.h +++ b/include/lf.h @@ -17,7 +17,6 @@ #define INCLUDE_LF_INCLUDED #include <my_atomic.h> -#include <my_cpu.h> C_MODE_START diff --git a/include/my_pthread.h b/include/my_pthread.h index 422be8e4b4a..3f56f7dd058 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -23,8 +23,6 @@ #define ETIME ETIMEDOUT /* For FreeBSD */ #endif -#include <my_atomic.h> - #ifdef __cplusplus #define EXTERNC extern "C" extern "C" { diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c index b98684556c3..646e584c152 100644 --- a/mysys/lf_alloc-pin.c +++ b/mysys/lf_alloc-pin.c @@ -102,6 +102,7 @@ #include <my_global.h> #include <my_sys.h> #include <lf.h> +#include "my_cpu.h" /* when using alloca() leave at least that many bytes of the stack - diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c index 5dbbc17141f..e626e88b6fd 100644 --- a/mysys/lf_hash.c +++ b/mysys/lf_hash.c @@ -28,6 +28,7 @@ #include <mysys_err.h> #include <my_bit.h> #include <lf.h> +#include "my_cpu.h" /* An element of the list */ typedef struct { diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c index 8cf5561072a..a22ffc50626 100644 --- a/mysys/my_fopen.c +++ b/mysys/my_fopen.c @@ -18,6 +18,7 @@ #include "my_static.h" #include <errno.h> #include "mysys_err.h" +#include "my_atomic.h" static void make_ftype(char * to,int flag); diff --git a/mysys/my_open.c b/mysys/my_open.c index 84f70280987..09fa201c0bd 100644 --- a/mysys/my_open.c +++ b/mysys/my_open.c @@ -17,6 +17,7 @@ #include "mysys_err.h" #include <m_string.h> #include <errno.h> +#include "my_atomic.h" CREATE_NOSYMLINK_FUNCTION( open_nosymlinks(const char *pathname, int flags, int mode), diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c index 4564059b31a..1441c25cc59 100644 --- a/mysys/waiting_threads.c +++ b/mysys/waiting_threads.c @@ -175,6 +175,7 @@ #include <my_global.h> #include <waiting_threads.h> #include <m_string.h> +#include "my_cpu.h" /* status variables */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 43f4e7d07fb..6615cd01dcf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -54,6 +54,7 @@ #include <m_ctype.h> #include <my_dir.h> #include <my_bit.h> +#include "my_cpu.h" #include "slave.h" #include "rpl_mi.h" #include "sql_repl.h" diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 18fc5ea70d7..3d739f6147a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -64,6 +64,7 @@ #endif #include "transaction.h" #include "opt_trace.h" +#include "my_cpu.h" enum enum_i_s_events_fields { diff --git a/sql/xa.cc b/sql/xa.cc index 9ee1cefbaf9..b08ab973cc5 100644 --- a/sql/xa.cc +++ b/sql/xa.cc @@ -19,6 +19,7 @@ #include "mariadb.h" #include "sql_class.h" #include "transaction.h" +#include "my_cpu.h" /*************************************************************************** diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h index 369892aa287..d9a617283f9 100644 --- a/storage/innobase/include/srv0mon.h +++ b/storage/innobase/include/srv0mon.h @@ -37,6 +37,7 @@ Created 12/15/2009 Jimmy Yang #endif /* __STDC_LIMIT_MACROS */ #include <stdint.h> +#include "my_atomic.h" /** Possible status values for "mon_status" in "struct monitor_value" */ enum monitor_running_status { diff --git a/storage/maria/lockman.c b/storage/maria/lockman.c index 590935967af..916b70b8344 100644 --- a/storage/maria/lockman.c +++ b/storage/maria/lockman.c @@ -109,6 +109,7 @@ #include <my_sys.h> #include <my_bit.h> #include <lf.h> +#include "my_cpu.h" #include "lockman.h" /* diff --git a/unittest/mysys/my_atomic-t.c b/unittest/mysys/my_atomic-t.c index 52bced7ce3b..1995a8e8950 100644 --- a/unittest/mysys/my_atomic-t.c +++ b/unittest/mysys/my_atomic-t.c @@ -14,6 +14,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include "thr_template.c" +#include "my_atomic.h" volatile uint32 b32; volatile int32 c32; |