diff options
-rw-r--r-- | include/wolf/port/netdb.h | 25 | ||||
-rw-r--r-- | include/wolf/port/sys.h | 2 | ||||
-rw-r--r-- | makefiles/gmake/compiler.mk | 4 | ||||
-rw-r--r-- | makefiles/gmake/platform.mk | 41 |
4 files changed, 67 insertions, 5 deletions
diff --git a/include/wolf/port/netdb.h b/include/wolf/port/netdb.h index bec4027..b910e0d 100644 --- a/include/wolf/port/netdb.h +++ b/include/wolf/port/netdb.h @@ -33,6 +33,18 @@ /* so far: LINUX, NETBSD, FREEBSD */ +/* for inet_ntop */ + +#if SUNOS +#if OS_MAJOR_VERSION == 5 +#if OS_MINOR_VERSION == 10 +#include <sys/socket.h> +#endif +#endif +#endif + +#include <arpa/inet.h> + /* for getaddrinfo, freeaddrinfo, struct getaddrinfo */ #ifdef FREEBSD @@ -42,12 +54,19 @@ #include </usr/include/netinet/in.h> /* for IPPROTO_TCP */ #endif +#if SUNOS +#if OS_MAJOR_VERSION == 5 +#if OS_MINOR_VERSION == 10 +#include <sys/types.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#endif +#endif +#endif + #include <netdb.h> /* for getaddrinfo, freeadrinfo, struct getaddrinfo */ -/* for inet_ntop */ -#include <arpa/inet.h> - #if !defined HAVE_GETADDRINFO || defined TEST_GETADDRINFO extern void wolf_port_getaddrinfo( void ); #endif /* !defined HAVE_GETADDRINFO || defined TEST_GETADDRINFO */ diff --git a/include/wolf/port/sys.h b/include/wolf/port/sys.h index 3e4435d..c293601 100644 --- a/include/wolf/port/sys.h +++ b/include/wolf/port/sys.h @@ -199,6 +199,8 @@ #define HAVE_SYSLOG_H #define HAVE_STRLCPY #define HAVE_STRLCAT +#define HAVE_GETADDRINFO +#define HAVE_INET_NTOP #else #error unknown platform #endif /* OS_MINOR_VERSION == 10 */ diff --git a/makefiles/gmake/compiler.mk b/makefiles/gmake/compiler.mk index e77e6d7..e18e591 100644 --- a/makefiles/gmake/compiler.mk +++ b/makefiles/gmake/compiler.mk @@ -248,8 +248,8 @@ endif CFLAGS = $(COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(PTHREADS_CFLAGS) CCPPFLAGS = $(CCPP_COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(PTHREADS_CFLAGS) -LDFLAGS = $(INCLUDE_LDFLAGS) $(PTHREADS_LDFLAGS) $(LDFLAGS_LT) -LIBS = $(INCLUDE_LIBS) $(PTHREADS_LIBS) $(LIBS_LT) +LDFLAGS = $(INCLUDE_LDFLAGS) $(PTHREADS_LDFLAGS) $(LDFLAGS_NET) $(LDFLAGS_LT) +LIBS = $(INCLUDE_LIBS) $(PTHREADS_LIBS) $(LIBS_NET) $(LIBS_LT) LINK = $(CC) CCPP_LINK = $(CCPP) diff --git a/makefiles/gmake/platform.mk b/makefiles/gmake/platform.mk index b81ccbb..4293d4c 100644 --- a/makefiles/gmake/platform.mk +++ b/makefiles/gmake/platform.mk @@ -141,3 +141,44 @@ endif endif endif + +# TCP/IP, DNS +############# + +ifeq "$(PLATFORM)" "LINUX" +INCLUDE_FLAGS_NET = +LDFLAGS_NET = +LIBS_NET = +endif + +ifeq "$(PLATFORM)" "SUNOS" +INCLUDE_FLAGS_NET = +LDFLAGS_NET = +LIBS_NET = -lsocket -lnsl +endif + +ifeq "$(PLATFORM)" "FREEBSD" +INCLUDE_FLAGS_NET = +LDFLAGS_NET = +LIBS_NET = +endif + +ifeq "$(PLATFORM)" "OPENBSD" +INCLUDE_FLAGS_NET = +LDFLAGS_NET = +LIBS_NET = +endif + +ifeq "$(PLATFORM)" "CYGWIN" +INCLUDE_FLAGS_NET = +LDFLAGS_NET = +LIBS_NET = +endif + +ifeq "$(PLATFORM)" "NETBSD" +INCLUDE_FLAGS_NET = +LDFLAGS_NET = +LIBS_NET = +endif + +PLATFORM_COMPILE_FLAGS += $(INCLUDE_FLAGS_NET) |