generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes for PellesC for Win32. It needs <unistd.h> for 'ssize_t'. Hence the

Browse Source 
rearrangement in ares_process.c.
This commit is contained in:
Gisle Vanem 2005-12-20 20:48:38 +00:00
parent df2b1251a0
commit f1f32477e3
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ares/ares_process.c
View File

@ -30,6 +30,8 @@
#ifdef HAVE_ARPA_NAMESER_COMPAT_H #ifdef HAVE_ARPA_NAMESER_COMPAT_H
#include <arpa/nameser_compat.h> #include <arpa/nameser_compat.h>
#endif #endif
#endif /* WIN32 && !WATT32 */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -39,7 +41,6 @@
#ifdef NETWARE #ifdef NETWARE
#include <sys/filio.h> #include <sys/filio.h>
#endif #endif
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

3
ares/config-win32.h
View File

@ -30,7 +30,8 @@
#endif #endif
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) #if defined(__MINGW32__) || defined(__WATCOMC__) || defined(__LCC__) || \
defined(__POCC__)
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#endif #endif

21
ares/setup.h
View File

@ -39,10 +39,10 @@
#endif /* HAVE_CONFIG_H */ #endif /* HAVE_CONFIG_H */
/* /*
* Include header files for windows builds before redefining anything. * Include header files for windows builds before redefining anything.
* Use this preproessor block only to include or exclude windows.h, * Use this preproessor block only to include or exclude windows.h,
* winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
* to any other further and independant block. * to any other further and independant block.
*/ */
@ -64,12 +64,13 @@
#endif #endif
/* /*
* Work-arounds for systems without configure support * Work-arounds for systems without configure support
*/ */
#ifndef HAVE_CONFIG_H #ifndef HAVE_CONFIG_H
#if defined(__DJGPP__) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) #if defined(__DJGPP__) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \
defined(__POCC__)
#else #else
#define ssize_t int #define ssize_t int
#endif #endif
@ -80,8 +81,8 @@
#endif /* HAVE_CONFIG_H */ #endif /* HAVE_CONFIG_H */
/* /*
* Recent autoconf versions define these symbols in config.h. We don't * Recent autoconf versions define these symbols in config.h. We don't
* want them (since they collide with the libcurl ones when we build * want them (since they collide with the libcurl ones when we build
* --enable-debug) so we undef them again here. * --enable-debug) so we undef them again here.
*/ */
@ -94,8 +95,8 @@
#undef VERSION #undef VERSION
#undef PACKAGE #undef PACKAGE
/* /*
* Typedef our socket type * Typedef our socket type
*/ */
#if defined(WIN32) && !defined(WATT32) #if defined(WIN32) && !defined(WATT32)
@ -106,7 +107,7 @@ typedef int ares_socket_t;
#define ARES_SOCKET_BAD -1 #define ARES_SOCKET_BAD -1
#endif #endif
/* /*
* Assume a few thing unless they're set by configure * Assume a few thing unless they're set by configure
*/ */