2008-07-06 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

Fixed the compile error on Nexenta OS(GNU/Solaris OS).
	Don't define `struct addrinfo' when __sun is defined.
	* src/getaddrinfo.h
pull/1/head
Tatsuhiro Tsujikawa 2008-07-06 11:16:23 +00:00
parent cfa808126b
commit c45e044b22
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2008-07-06 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fixed the compile error on Nexenta OS(GNU/Solaris OS).
Don't define `struct addrinfo' when __sun is defined.
* src/getaddrinfo.h
2008-07-06 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-07-06 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Introduced a2_struct_stat. It is defined as `struct _stati64' if Introduced a2_struct_stat. It is defined as `struct _stati64' if

View File

@ -161,7 +161,7 @@ extern "C" {
#define getnameinfo my_getnameinfo #define getnameinfo my_getnameinfo
#endif #endif
# <from linux's netdb.h> /* <from linux's netdb.h> */
/* Possible values for `ai_flags' field in `addrinfo' structure. */ /* Possible values for `ai_flags' field in `addrinfo' structure. */
# define AI_PASSIVE 0x0001 /* Socket address is intended for `bind'. */ # define AI_PASSIVE 0x0001 /* Socket address is intended for `bind'. */
# define AI_CANONNAME 0x0002 /* Request for canonical name. */ # define AI_CANONNAME 0x0002 /* Request for canonical name. */
@ -219,7 +219,7 @@ extern "C" {
# define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to # define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to
STD3 rules. */ STD3 rules. */
# endif # endif
# </from linux's netdb.h> /* </from linux's netdb.h> */
#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) #define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG)
@ -233,7 +233,8 @@ extern "C" {
#define PF_UNSPEC PF_INET #define PF_UNSPEC PF_INET
#endif #endif
#ifndef __MINGW32__ /* Nexenta OS(GNU/Solaris OS) defines `struct addrinfo' in netdb.h */
#if !defined( __MINGW32__ ) && !defined( __sun )
/* /*
* struct addrinfo. * struct addrinfo.
@ -249,7 +250,7 @@ struct addrinfo {
struct addrinfo *ai_next; struct addrinfo *ai_next;
}; };
#endif // __MINGW32__ #endif // !__MINGW32__ && !__sun
/* /*
* Functions. * Functions.