summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/hash.h1
-rw-r--r--include/m_ctype.h1
-rw-r--r--include/m_string.h1
-rw-r--r--include/my_base.h1
-rw-r--r--include/my_bit.h2
-rw-r--r--include/my_compiler.h2
-rw-r--r--include/my_dir.h2
-rw-r--r--include/my_net.h2
-rw-r--r--include/my_pthread.h2
-rw-r--r--include/my_stacktrace.h2
-rw-r--r--include/my_sys.h2
-rw-r--r--include/my_time.h1
-rw-r--r--include/my_user.h2
-rw-r--r--include/mysql/psi/mysql_file.h2
-rw-r--r--include/password.h2
-rw-r--r--include/queues.h2
-rw-r--r--include/waiting_threads.h1
-rw-r--r--include/wqueue.h1
18 files changed, 0 insertions, 29 deletions
diff --git a/include/hash.h b/include/hash.h
index 892922d81a3..75ad0b6d9a0 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -19,7 +19,6 @@
#ifndef _hash_h
#define _hash_h
-#include "my_global.h" /* uchar */
#include "my_sys.h" /* DYNAMIC_ARRAY */
/*
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 04a82953f0a..b78443f88f8 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -21,7 +21,6 @@
#define _m_ctype_h
#include <my_attribute.h>
-#include "my_global.h" /* uint16, uchar */
enum loglevel {
ERROR_LEVEL= 0,
diff --git a/include/m_string.h b/include/m_string.h
index f06acbea358..c50d37a361b 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -22,7 +22,6 @@
#ifndef _m_string_h
#define _m_string_h
-#include "my_global.h" /* HAVE_* */
#include "my_decimal_limits.h"
#ifndef __USE_GNU
diff --git a/include/my_base.h b/include/my_base.h
index 57b16ad985b..b93300d7562 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -20,7 +20,6 @@
#ifndef _my_base_h
#define _my_base_h
-#include <my_global.h>
#include <my_dir.h> /* This includes types */
#include <my_sys.h>
#include <m_string.h>
diff --git a/include/my_bit.h b/include/my_bit.h
index 0afeffff918..221e7d274ea 100644
--- a/include/my_bit.h
+++ b/include/my_bit.h
@@ -17,8 +17,6 @@
#ifndef MY_BIT_INCLUDED
#define MY_BIT_INCLUDED
-#include <my_global.h>
-
/*
Some useful bit functions
*/
diff --git a/include/my_compiler.h b/include/my_compiler.h
index 000d4e42848..833eedbf7c4 100644
--- a/include/my_compiler.h
+++ b/include/my_compiler.h
@@ -24,8 +24,6 @@
specific to a target compiler.
*/
-#include <my_global.h> /* stddef.h offsetof */
-
/**
Compiler-dependent internal convenience macros.
*/
diff --git a/include/my_dir.h b/include/my_dir.h
index 949a9a4d354..a1a03ffe1d2 100644
--- a/include/my_dir.h
+++ b/include/my_dir.h
@@ -16,8 +16,6 @@
#ifndef MY_DIR_H
#define MY_DIR_H
-#include "my_global.h"
-
#include <sys/stat.h>
#ifdef __cplusplus
diff --git a/include/my_net.h b/include/my_net.h
index 91d780a276d..222abdb2f37 100644
--- a/include/my_net.h
+++ b/include/my_net.h
@@ -22,8 +22,6 @@
#ifndef _my_net_h
#define _my_net_h
-#include "my_global.h" /* C_MODE_START, C_MODE_END */
-
C_MODE_START
#include <errno.h>
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 672bca5ab39..037ac0a062f 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -19,8 +19,6 @@
#ifndef _my_pthread_h
#define _my_pthread_h
-#include "my_global.h" /* myf */
-
#ifndef ETIME
#define ETIME ETIMEDOUT /* For FreeBSD */
#endif
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h
index fad6e532de9..f5eeffbd969 100644
--- a/include/my_stacktrace.h
+++ b/include/my_stacktrace.h
@@ -17,8 +17,6 @@
#ifndef _my_stacktrace_h_
#define _my_stacktrace_h_
-#include <my_global.h>
-
#ifdef TARGET_OS_LINUX
#if defined (__x86_64__) || defined (__i386__) || \
(defined(__alpha__) && defined(__GNUC__))
diff --git a/include/my_sys.h b/include/my_sys.h
index fb3e15b64a4..afe50d9a67c 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -17,8 +17,6 @@
#ifndef _my_sys_h
#define _my_sys_h
-#include "my_global.h" /* C_MODE_START, C_MODE_END */
-
#include <m_string.h>
C_MODE_START
diff --git a/include/my_time.h b/include/my_time.h
index 02e8f32ee23..1e99b14421d 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -22,7 +22,6 @@
#ifndef _my_time_h_
#define _my_time_h_
-#include "my_global.h"
#include "mysql_time.h"
#include "my_decimal_limits.h"
diff --git a/include/my_user.h b/include/my_user.h
index 404996e996c..6d4cd3ab4bd 100644
--- a/include/my_user.h
+++ b/include/my_user.h
@@ -22,8 +22,6 @@
#ifndef _my_user_h_
#define _my_user_h_
-#include <my_global.h>
-
C_MODE_START
int parse_user(const char *user_id_str, size_t user_id_len,
diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h
index be9d7116b9b..801c26086f5 100644
--- a/include/mysql/psi/mysql_file.h
+++ b/include/mysql/psi/mysql_file.h
@@ -16,8 +16,6 @@
#ifndef MYSQL_FILE_H
#define MYSQL_FILE_H
-#include <my_global.h>
-
/* For strlen() */
#include <string.h>
/* For MY_STAT */
diff --git a/include/password.h b/include/password.h
index 082f917e7c0..1abd014ceb4 100644
--- a/include/password.h
+++ b/include/password.h
@@ -16,8 +16,6 @@
#ifndef PASSWORD_INCLUDED
#define PASSWORD_INCLUDED
-#include "my_global.h"
-
C_MODE_START
void my_make_scrambled_password_323(char *to, const char *password,
diff --git a/include/queues.h b/include/queues.h
index f341bbb8148..09c096311a3 100644
--- a/include/queues.h
+++ b/include/queues.h
@@ -31,8 +31,6 @@
#ifndef _queues_h
#define _queues_h
-#include "my_global.h" /* uchar */
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/waiting_threads.h b/include/waiting_threads.h
index cd4db35701c..0145f68837a 100644
--- a/include/waiting_threads.h
+++ b/include/waiting_threads.h
@@ -16,7 +16,6 @@
#ifndef _waiting_threads_h
#define _waiting_threads_h
-#include <my_global.h>
#include <my_sys.h>
#include <lf.h>
diff --git a/include/wqueue.h b/include/wqueue.h
index 69cb715a97d..119416abe4a 100644
--- a/include/wqueue.h
+++ b/include/wqueue.h
@@ -18,7 +18,6 @@
#ifndef WQUEUE_INCLUDED
#define WQUEUE_INCLUDED
-#include <my_global.h>
#include <my_pthread.h>
/* info about requests in a waiting queue */