diff options
| author | unknown <petr@mysql.com> | 2004-12-18 03:53:43 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-12-18 03:53:43 +0300 |
| commit | 491baa972a2a2f373ae4dd3a1de2470169527326 (patch) | |
| tree | d8d4592cf0dfa1a2181ba96de6ec1b0bfff82a60 | |
| parent | d9b8e4b84c0c377ac4cc7f6d762f304511a41868 (diff) | |
| parent | 59b24f9f39ab0538da3b026ecfcba8bdcc0276fe (diff) | |
| download | mariadb-git-491baa972a2a2f373ae4dd3a1de2470169527326.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
sql/mysqld.cc:
Auto merged
sql-common/client.c:
Auto merged
| -rw-r--r-- | include/my_net.h | 5 | ||||
| -rw-r--r-- | sql-common/client.c | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/include/my_net.h b/include/my_net.h index 7b42afa1f3a..71914964e46 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -72,6 +72,11 @@ C_MODE_START #define in_addr_t uint32 #endif +/* On some operating systems (e.g. Solaris) INADDR_NONE is not defined */ +#ifndef INADDR_NONE +#define INADDR_NONE -1 /* Error value from inet_addr */ +#endif + /* Thread safe or portable version of some functions */ void my_inet_ntoa(struct in_addr in, char *buf); diff --git a/sql-common/client.c b/sql-common/client.c index 1a9bc4221a0..a014e398d8b 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -98,9 +98,6 @@ my_bool net_flush(NET *net); # include <sys/un.h> #endif -#ifndef INADDR_NONE -#define INADDR_NONE -1 -#endif #if defined(MSDOS) || defined(__WIN__) #define perror(A) #else diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e4e1f29a342..c5698469341 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -78,10 +78,6 @@ #define IF_PURIFY(A,B) (B) #endif -#ifndef INADDR_NONE -#define INADDR_NONE -1 // Error value from inet_addr -#endif - /* stack traces are only supported on linux intel */ #if defined(__linux__) && defined(__i386__) && defined(USE_PSTACK) #define HAVE_STACK_TRACE_ON_SEGV @@ -111,6 +107,7 @@ extern "C" { // Because of SCO 3.2V4.2 #ifdef HAVE_GRP_H #include <grp.h> #endif +#include <my_net.h> #if defined(OS2) # include <sys/un.h> |