diff options
| -rw-r--r-- | ares/Makefile.netware | 7 | ||||
| -rw-r--r-- | ares/ares.h | 2 | ||||
| -rw-r--r-- | ares/ares_getnameinfo.c | 4 | ||||
| -rw-r--r-- | ares/ares_init.c | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/ares/Makefile.netware b/ares/Makefile.netware index d5bfe7c06..c8e91c6d4 100644 --- a/ares/Makefile.netware +++ b/ares/Makefile.netware @@ -281,8 +281,8 @@ config.h: Makefile.netware @echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@ ifeq ($(LIBARCH),CLIB) @echo $(DL)#define OS "i586-pc-clib-NetWare"$(DL) >> $@ + @echo $(DL)#define MAXHOSTNAMELEN 256$(DL) >> $@ @echo $(DL)#define NETDB_USE_INTERNET 1$(DL) >> $@ - @echo $(DL)#define HAVE_STRICMP 1$(DL) >> $@ @echo $(DL)#define RECV_TYPE_ARG1 int$(DL) >> $@ @echo $(DL)#define RECV_TYPE_ARG2 char *$(DL) >> $@ @echo $(DL)#define RECV_TYPE_ARG3 int$(DL) >> $@ @@ -294,9 +294,10 @@ ifeq ($(LIBARCH),CLIB) @echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@ @echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@ @echo $(DL)#define SEND_TYPE_RETV int$(DL) >> $@ - @echo $(DL)#define socklen_t int$(DL) >> $@ @echo $(DL)#define DL_LDAP_FILE "ldapsdk.nlm"$(DL) >> $@ - @echo $(DL)#define MAXHOSTNAMELEN 256$(DL) >> $@ + @echo $(DL)#define socklen_t int$(DL) >> $@ + @echo $(DL)#define strncasecmp strnicmp$(DL) >> $@ + @echo $(DL)#define strcasecmp stricmp$(DL) >> $@ else @echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@ @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@ diff --git a/ares/ares.h b/ares/ares.h index 6b942951f..04b17ed62 100644 --- a/ares/ares.h +++ b/ares/ares.h @@ -20,7 +20,7 @@ #include <sys/types.h> -#if defined(_AIX) || defined(NETWARE) +#if defined(_AIX) || (defined(NETWARE) && defined(__NOVELL_LIBC__)) /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish libc5-based Linux systems. Only include it on system that are known to require it! */ diff --git a/ares/ares_getnameinfo.c b/ares/ares_getnameinfo.c index 8d10cfc11..2c28cebf6 100644 --- a/ares/ares_getnameinfo.c +++ b/ares/ares_getnameinfo.c @@ -295,8 +295,12 @@ static char *lookup_service(unsigned short port, int flags, #endif #else /* Lets just hope the OS uses TLS! */ +#if (defined(NETWARE) && !defined(__NOVELL_LIBC__)) + sep = getservbyport(port, (char*)proto); +#else sep = getservbyport(port, proto); #endif +#endif } if (sep && sep->s_name) /* get service name */ diff --git a/ares/ares_init.c b/ares/ares_init.c index c9faf45a0..f6018c90c 100644 --- a/ares/ares_init.c +++ b/ares/ares_init.c @@ -23,7 +23,10 @@ #include <malloc.h> #else +#ifdef HAVE_SYS_PARAM_H #include <sys/param.h> +#endif + #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif |