Commit 59b24f9f authored by unknown's avatar unknown

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
parent d9f5d2f3
......@@ -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);
......
......@@ -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
......
......@@ -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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment