projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c821a8
)
Fix ssize_t redefinition errors on WIN64 reported by Alexey Simak
author
Yang Tse
<yangsita@gmail.com>
Tue, 6 Oct 2009 13:59:37 +0000
(13:59 +0000)
committer
Yang Tse
<yangsita@gmail.com>
Tue, 6 Oct 2009 13:59:37 +0000
(13:59 +0000)
ares/config-win32.h
patch
|
blob
|
history
ares/setup.h
patch
|
blob
|
history
diff --git
a/ares/config-win32.h
b/ares/config-win32.h
index
e8c5d72
..
6f2fbc2
100644
(file)
--- a/
ares/config-win32.h
+++ b/
ares/config-win32.h
@@
-196,12
+196,16
@@
#define RETSIGTYPE void
/* 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)
#define ssize_t __int64
#else
#define ssize_t int
#endif
+#define _SSIZE_T_DEFINED
+#endif
/* ---------------------------------------------------------------- */
/* STRUCT RELATED */
diff --git
a/ares/setup.h
b/ares/setup.h
index
8750624
..
69ee510
100644
(file)
--- a/
ares/setup.h
+++ b/
ares/setup.h
@@
-133,12
+133,6
@@
#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__)
#define HAVE_SYS_TIME_H
#endif