diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/checksum.c | 2 | ||||
| -rw-r--r-- | mysys/getopt.c | 2 | ||||
| -rw-r--r-- | mysys/getopt1.c | 2 | ||||
| -rw-r--r-- | mysys/make-conf.c | 2 | ||||
| -rw-r--r-- | mysys/my_alloc.c | 2 | ||||
| -rw-r--r-- | mysys/my_clock.c | 2 | ||||
| -rw-r--r-- | mysys/my_compress.c | 2 | ||||
| -rw-r--r-- | mysys/mysys_priv.h | 2 | ||||
| -rw-r--r-- | mysys/test_charset.c | 2 | ||||
| -rw-r--r-- | mysys/testhash.c | 2 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 2 | ||||
| -rw-r--r-- | mysys/thr_mutex.c | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/mysys/checksum.c b/mysys/checksum.c index 00861853945..0da40d1ab4a 100644 --- a/mysys/checksum.c +++ b/mysys/checksum.c @@ -17,7 +17,7 @@ /* Calculate a long checksum for a memoryblock. Used to verify pack_isam */ -#include <global.h> +#include <my_global.h> #include "my_sys.h" ulong checksum(const byte *mem, uint count) diff --git a/mysys/getopt.c b/mysys/getopt.c index 774cf3b82f4..35db805d997 100644 --- a/mysys/getopt.c +++ b/mysys/getopt.c @@ -46,7 +46,7 @@ Cambridge, MA 02139, USA. */ #endif #endif -#include <global.h> /* Changes for mysys */ +#include <my_global.h> /* Changes for mysys */ #include <m_string.h> /* Comment out all this code if we are using the GNU C Library, and are not diff --git a/mysys/getopt1.c b/mysys/getopt1.c index bff76d6e5b2..15f3c8f544b 100644 --- a/mysys/getopt1.c +++ b/mysys/getopt1.c @@ -24,7 +24,7 @@ Cambridge, MA 02139, USA. */ #include <config.h> #endif -#include <global.h> +#include <my_global.h> #include "getopt.h" #if (!defined (__STDC__) || !__STDC__) && !defined(MSDOS) && !defined(OS2) diff --git a/mysys/make-conf.c b/mysys/make-conf.c index 9db766574e2..0a2a1a7b195 100644 --- a/mysys/make-conf.c +++ b/mysys/make-conf.c @@ -34,7 +34,7 @@ #define CH_INCLUDE STRINGIZE(CH_SRC) /* aaaah, that's better */ -#include <my_global.h> +#include <my_my_global.h> #include CH_INCLUDE #include <stdio.h> diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 0c61d2ede3c..fe9431ff57a 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -17,7 +17,7 @@ /* Routines to handle mallocing of results which will be freed the same time */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> diff --git a/mysys/my_clock.c b/mysys/my_clock.c index e7d1758fa2e..332bf1ed38d 100644 --- a/mysys/my_clock.c +++ b/mysys/my_clock.c @@ -16,7 +16,7 @@ MA 02111-1307, USA */ #define USES_TYPES -#include "global.h" +#include "my_global.h" #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(OS2) #include "mysys_priv.h" diff --git a/mysys/my_compress.c b/mysys/my_compress.c index 11204562ac8..3f93e55af9c 100644 --- a/mysys/my_compress.c +++ b/mysys/my_compress.c @@ -17,7 +17,7 @@ /* Written by Sinisa Milivojevic <sinisa@mysql.com> */ -#include <global.h> +#include <my_global.h> #ifdef HAVE_COMPRESS #include <my_sys.h> #include <zlib.h> diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 20fda270658..f203466accd 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #ifdef USE_SYSTEM_WRAPPERS diff --git a/mysys/test_charset.c b/mysys/test_charset.c index 6a5183d2cd3..96050c368c1 100644 --- a/mysys/test_charset.c +++ b/mysys/test_charset.c @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <global.h> +#include <my_global.h> #include <m_ctype.h> #include <my_sys.h> #include <mysql_version.h> diff --git a/mysys/testhash.c b/mysys/testhash.c index a8fbf800595..703f5b1b7d7 100644 --- a/mysys/testhash.c +++ b/mysys/testhash.c @@ -17,7 +17,7 @@ /* Test av hash libarary: stor test */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <hash.h> #include <m_string.h> diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index f51f27b7f51..2f29e742026 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <global.h> +#include <my_global.h> #if defined(THREAD) && !defined(DONT_USE_THR_ALARM) #include <errno.h> diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index fa7ae4f1e82..340f1461823 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -17,7 +17,7 @@ /* This makes a wrapper for mutex handling to make it easier to debug mutex */ -#include <global.h> +#include <my_global.h> #if defined(HAVE_LINUXTHREADS) && !defined (__USE_UNIX98) #define __USE_UNIX98 /* To get rw locks under Linux */ #endif |