mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254

Browse source 
into  polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254


include/my_global.h:
  Auto merged
This commit is contained in:
unknown 2007-10-12 14:52:02 +04:00
commit a463718e59
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config/ac-macros/large_file.m4
View file

@ -128,8 +128,15 @@ AC_DEFUN([MYSQL_SYS_LARGEFILE],
ac_cv_sys_largefile_source=1 ;; ac_cv_sys_largefile_source=1 ;;
esac]) esac])
# AIX 4.2 and later -- do nothing, include standards.h instead. AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
# this goes for both GNU and IBM C and C++ compilers. ac_cv_sys_large_files,
[Large files support on AIX-style hosts.],
[case "$host_os" in
# Large file support on AIX is available starting from version 4.2
# Tested only on 5.2 and up
aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
ac_cv_sys_large_files=1 ;;
esac])
fi fi
]) ])

5
include/my_global.h
View file

@ -107,6 +107,11 @@
#define NETWARE_SET_SCREEN_MODE(A) #define NETWARE_SET_SCREEN_MODE(A)
#endif #endif
/* Workaround for _LARGE_FILES and _LARGE_FILE_API incompatibility on AIX */
#if defined(_AIX) && defined(_LARGE_FILE_API)
#undef _LARGE_FILE_API
#endif
/* /*
The macros below are used to allow build of Universal/fat binaries of The macros below are used to allow build of Universal/fat binaries of
MySQL and MySQL applications under darwin. MySQL and MySQL applications under darwin.