Shrink my_atomic.h and my_cpu.h scope

MariaDB · Apr 15, 2020 · 5679a2b · 5679a2b
1 parent 4bd9f82
commit 5679a2b
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;