diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 11 | ||||
| -rw-r--r-- | include/m_ctype.h | 2 | ||||
| -rw-r--r-- | include/my_base.h | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index f3685b51cd3..0821afeb01d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -22,7 +22,7 @@ pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ my_global.h my_net.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ sslopt-vars.h $(BUILT_SOURCES) -noinst_HEADERS = global.h config-win.h \ +noinst_HEADERS = config-win.h \ nisam.h heap.h merge.h my_bitmap.h\ myisam.h myisampack.h myisammrg.h ft_global.h\ my_dir.h mysys_err.h my_base.h \ @@ -32,12 +32,12 @@ noinst_HEADERS = global.h config-win.h \ mysql_version.h.in # mysql_version.h are generated -SUPERCLEANFILES = mysql_version.h my_global.h my_config.h +SUPERCLEANFILES = mysql_version.h my_config.h # Some include files that may be moved and patched by configure DISTCLEANFILES = sched.h -all-local: my_global.h my_config.h +all-local: my_config.h # Since we include my_config.h it better exist from the beginning link_sources: @@ -48,11 +48,6 @@ link_sources: my_config.h: ../config.h $(CP) ../config.h my_config.h -# This should be changed in the source and removed. -my_global.h: global.h - $(RM) -f my_global.h - $(CP) global.h my_global.h - # These files should not be included in distributions since they are # generated by configure from the .h.in files dist-hook: diff --git a/include/m_ctype.h b/include/m_ctype.h index 645c07b79ae..b41323e10b9 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -17,7 +17,7 @@ /* A better inplementation of the UNIX ctype(3) library. - Notes: global.h should be included before ctype.h + Notes: my_global.h should be included before ctype.h */ #ifndef _m_ctype_h diff --git a/include/my_base.h b/include/my_base.h index e677f448c57..c4c1a0763fd 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -24,7 +24,7 @@ #ifndef stdin /* Included first in handler */ #define USES_TYPES /* my_dir with sys/types is included */ #define CHSIZE_USED -#include <global.h> +#include <my_global.h> #include <my_dir.h> /* This includes types */ #include <my_sys.h> #include <m_string.h> |