diff options
| author | unknown <petr@mysql.com> | 2004-12-18 03:21:20 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-12-18 03:21:20 +0300 |
| commit | 59b24f9f39ab0538da3b026ecfcba8bdcc0276fe (patch) | |
| tree | 8534c659fc49cd07781b03d887a9d5bd7e175b7b | |
| parent | d9f5d2f328f70c7fdc823bb704f7e02bb1d25266 (diff) | |
| download | mariadb-git-59b24f9f39ab0538da3b026ecfcba8bdcc0276fe.tar.gz | |
BUG#7384 IM fails to compile on Solaris.
Solaris doesn't define INADDR_NONE macro. This resulted in compilation
failure. (advanced fix)
include/my_net.h:
Added INADDR_NONE define
sql-common/client.c:
removed INADDR_NONE define as it is moved to my_net.h
sql/mysqld.cc:
add my_net.h define and remove INADDR_NONE
| -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 fd65ed01462..8b61589023f 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 6accb745648..d0c3cb826d9 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> |