Commit 60af1cbc authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

djgpp fixes by Gisle

parent 8952ef93

ares/CHANGES

+4 −0
Original line number Diff line number Diff line 
  Changelog for the c-ares project



* July 1

- Gisle Vanem provided Makefile.dj to build with djgpp, added a few more djgpp

  fixes and made ares not use 'errno' to provide further info on Windows.



* June 30

- Gisle Vanem made it build with djgpp and run fine with the Watt-32 stack.

ares/ares_gethostbyaddr.c

+6 −0
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ static int file_lookup(struct in_addr *addr, struct hostent **host) 
    strcat(PATH_HOSTS, PATH_HOSTS_9X);

  }



#elif defined(WATT32)

  extern const char *_w32_GetHostsFile (void);

  const char *PATH_HOSTS = _w32_GetHostsFile();



  if (!PATH_HOSTS)

    return ARES_ENOTFOUND;

#endif



  fp = fopen(PATH_HOSTS, "r");

ares/ares_gethostbyname.c

+6 −0
Original line number Diff line number Diff line
@@ -224,6 +224,12 @@ static int file_lookup(const char *name, struct hostent **host) 
    strcat(PATH_HOSTS, PATH_HOSTS_9X);

  }



#elif defined(WATT32)

  extern const char *_w32_GetHostsFile (void);

  const char *PATH_HOSTS = _w32_GetHostsFile();



  if (!PATH_HOSTS)

    return ARES_ENOTFOUND;

#endif



  fp = fopen(PATH_HOSTS, "r");

ares/ares_private.h

+5 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <sys/ioctl.h>

#undef  closesocket

#define closesocket(s)    close_s(s)

#define select(n,r,w,x,t) select_s(n,r,w,x,t)

#define writev(s,v,c)     writev_s(s,v,c)

#endif
@@ -52,6 +51,10 @@ 
#define PATH_HOSTS_NT  "\\drivers\\etc\\hosts"

#define PATH_HOSTS_9X  "\\hosts"



#elif defined(WATT32)



#define PATH_RESOLV_CONF "/dev/ENV/etc/resolv.conf"



#else



#define PATH_RESOLV_CONF	"/etc/resolv.conf"

ares/nameser.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define MAXHOSTNAMELEN 256



#define EINPROGRESS WSAEINPROGRESS

#define EWOULDBLOCK WSAEWOULDBLOCK



/* Structure for scatter/gather I/O.  */

struct iovec