Commit 8af3a352 authored by Jason Madden's avatar Jason Madden

Re-enable all Travis builds and try a fix for appveyor

parent db5bdb72
...@@ -10,16 +10,16 @@ env: ...@@ -10,16 +10,16 @@ env:
matrix: matrix:
# These are ordered to get as much diversity in the # These are ordered to get as much diversity in the
# first group of parallel runs (4) as posible # first group of parallel runs (4) as posible
#- TASK=test-py27-noembed - TASK=test-py27-noembed
#- TASK=test-pypy - TASK=test-pypy
#- TASK=test-py36 - TASK=test-py36
- TASK=lint-py27 - TASK=lint-py27
#- TASK=test-pypy3 - TASK=test-pypy3
- TASK=test-py35 - TASK=test-py35
#- TASK=test-py278 - TASK=test-py278
- TASK=test-py27 - TASK=test-py27
#- TASK=test-py34 - TASK=test-py34
#- TASK=test-py27-cffi - TASK=test-py27-cffi
matrix: matrix:
fast_finish: true fast_finish: true
......
...@@ -71,8 +71,6 @@ def configure_ares(bext, ext): ...@@ -71,8 +71,6 @@ def configure_ares(bext, ext):
with open('configure-output.txt', 'r') as t: with open('configure-output.txt', 'r') as t:
print(t.read(), file=sys.stderr) print(t.read(), file=sys.stderr)
raise raise
with open('configure-output.txt', 'r') as t:
print(t.read(), file=sys.stderr)
if sys.platform == 'darwin': if sys.platform == 'darwin':
make_universal_header('ares_build.h', 'CARES_SIZEOF_LONG') make_universal_header('ares_build.h', 'CARES_SIZEOF_LONG')
make_universal_header('ares_config.h', 'SIZEOF_LONG', 'SIZEOF_SIZE_T', 'SIZEOF_TIME_T') make_universal_header('ares_config.h', 'SIZEOF_LONG', 'SIZEOF_SIZE_T', 'SIZEOF_TIME_T')
......
...@@ -251,4 +251,17 @@ ...@@ -251,4 +251,17 @@
typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t; typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
#endif #endif
/* Data type definition of ares_ssize_t. */
#ifdef _WIN32
# ifdef _WIN64
# define CARES_TYPEOF_ARES_SSIZE_T __int64
# else
# define CARES_TYPEOF_ARES_SSIZE_T long
# endif
#else
# define CARES_TYPEOF_ARES_SSIZE_T ssize_t;
#endif
typedef CARES_TYPEOF_ARES_SSIZE_T ares_ssize_t;
#endif /* __CARES_BUILD_H */ #endif /* __CARES_BUILD_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment