diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-17 10:42:50 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-17 10:42:50 -0400 |
| commit | d3efda57e00d69d62ec1526a35ef850748519371 (patch) | |
| tree | 506e13dafaf7c8c3e52dd7f53c69ee5a0b10dfc0 /server-tools | |
| parent | b2cfa703f4799e68bc41dd651e30d4057b5c7076 (diff) | |
| parent | 70d5bb95f98a362597cede8141b8a845a4e36eec (diff) | |
| download | mariadb-git-d3efda57e00d69d62ec1526a35ef850748519371.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/portability.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/server-tools/instance-manager/portability.h b/server-tools/instance-manager/portability.h index 1a3be5705e3..23a5a5bd14c 100644 --- a/server-tools/instance-manager/portability.h +++ b/server-tools/instance-manager/portability.h @@ -1,7 +1,11 @@ #ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H #define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H -#if defined(_SCO_DS) && !defined(SHUT_RDWR) +#if (defined(_SCO_DS) || defined(UNIXWARE_7)) && !defined(SHUT_RDWR) +/* + SHUT_* functions are defined only if + "(defined(_XOPEN_SOURCE) && _XOPEN_SOURCE_EXTENDED - 0 >= 1)" +*/ #define SHUT_RDWR 2 #endif |