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

Fix ssize_t redefinition errors on WIN64 reported by Alexey Simak

Browse Source
This commit is contained in:
Yang Tse 2009-10-06 13:59:37 +00:00
parent 7c821a85f8
commit 1209f2c014
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ares/config-win32.h
View File

@ -196,12 +196,16 @@
#define RETSIGTYPE void #define RETSIGTYPE void
/* Define ssize_t if it is not an available 'typedefed' type */ /* Define ssize_t if it is not an available 'typedefed' type */
#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) #ifndef _SSIZE_T_DEFINED
#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || defined(__POCC__) || \
defined(__MINGW32__)
#elif defined(_WIN64) #elif defined(_WIN64)
#define ssize_t __int64 #define ssize_t __int64
#else #else
#define ssize_t int #define ssize_t int
#endif #endif
#define _SSIZE_T_DEFINED
#endif
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* STRUCT RELATED */ /* STRUCT RELATED */

6
ares/setup.h
View File

@ -133,12 +133,6 @@
#ifndef HAVE_CONFIG_H #ifndef HAVE_CONFIG_H
#if defined(__DJGPP__) || (defined(__WATCOMC__) && (__WATCOMC__ >= 1240)) || \
defined(__POCC__)
#else
#define ssize_t int
#endif
#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__) #if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
#define HAVE_SYS_TIME_H #define HAVE_SYS_TIME_H
#endif #endif