Commit 7509ef6b authored by Guenter Knauf's avatar Guenter Knauf
Browse files

few minor changes to make ares compile for NetWare CLIB architecture.

parent 70f8068d

ares/Makefile.netware

+4 −3
Original line number Diff line number Diff line
@@ -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) >> $@

ares/ares.h

+1 −1
Original line number Diff line number Diff line
@@ -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! */

ares/ares_getnameinfo.c

+4 −0
Original line number Diff line number Diff line
@@ -295,7 +295,11 @@ 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)

ares/ares_init.c

+3 −0
Original line number Diff line number Diff line
@@ -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