diff options
| author | Andi Gutmans <andi@php.net> | 2001-06-02 00:38:55 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-06-02 00:38:55 +0000 |
| commit | ac2cd94caa6ed8ad45039a5f4a486f3714e9d9f9 (patch) | |
| tree | 66010de346051ba017fd7641d0f439fb59ae8117 | |
| parent | c4627466b9ffff622d66fb0b58f9ec554e3e50ab (diff) | |
| download | php-git-ac2cd94caa6ed8ad45039a5f4a486f3714e9d9f9.tar.gz | |
- Merge two important fixes from HEAD.
| -rw-r--r-- | ext/mysql/libmysql/acinclude.m4 | 25 | ||||
| -rw-r--r-- | ext/mysql/libmysql/mysql_version.h | 5 |
2 files changed, 28 insertions, 2 deletions
diff --git a/ext/mysql/libmysql/acinclude.m4 b/ext/mysql/libmysql/acinclude.m4 index c9e0973fef..0fb030b803 100644 --- a/ext/mysql/libmysql/acinclude.m4 +++ b/ext/mysql/libmysql/acinclude.m4 @@ -295,6 +295,30 @@ then fi ]) +AC_DEFUN(MYSQL_CHECK_INT_8_16_32, +[AC_MSG_CHECKING([for int8]) +AC_TRY_RUN([ +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif + +#ifdef HAVE_STDDEF_H +#include <stddef.h> +#endif + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +int main() +{ + int8 i; + return 0; +} +], AC_DEFINE(HAVE_INT_8_16_32, , [ ]) AC_MSG_RESULT([yes]), AC_MSG_RESULT([no]) +) +]) + AC_DEFUN(MYSQL_HEADER_CHECKS,[ AC_HEADER_STDC AC_CHECK_HEADERS(sgtty.h sys/ioctl.h \ @@ -322,6 +346,7 @@ AC_TYPE_UID_T MYSQL_CHECK_ULONG MYSQL_CHECK_UCHAR MYSQL_CHECK_UINT +MYSQL_CHECK_INT_8_16_32 MYSQL_TYPE_ACCEPT MYSQL_TYPE_QSORT diff --git a/ext/mysql/libmysql/mysql_version.h b/ext/mysql/libmysql/mysql_version.h index 3ec9679c04..c47059996b 100644 --- a/ext/mysql/libmysql/mysql_version.h +++ b/ext/mysql/libmysql/mysql_version.h @@ -13,8 +13,9 @@ This file is public domain and comes with NO WARRANTY of any kind */ #define MYSQL_VERSION_ID 32332 #define MYSQL_PORT 3306 -/* This is defined at configure time and found in main/php_config.h */ -/* #define MYSQL_UNIX_ADDR "/tmp/mysql.sock" */ +#ifndef MYSQL_UNIX_ADDR +#define MYSQL_UNIX_ADDR "/tmp/mysql.sock" +#endif /* mysqld compile time options */ #ifndef MYSQL_CHARSET |