Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
620a1792 · msvensson@neptunus.(none) · b9b2ef9c · 2469667e · 620a1792
Commit 620a1792 authored Aug 03, 2006 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

server-tools/instance-manager/portability.h server-tools/instance-manager/portability.h +5 -1

No files found.
--- a/server-tools/instance-manager/portability.h
+++ b/server-tools/instance-manager/portability.h
 #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