Skip to content

Commit

Permalink
Re-enable all Travis builds and try a fix for appveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
jamadden committed Nov 11, 2017
1 parent db5bdb7 commit 8af3a35
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ env:
matrix:
# These are ordered to get as much diversity in the
# first group of parallel runs (4) as posible
#- TASK=test-py27-noembed
#- TASK=test-pypy
#- TASK=test-py36
- TASK=test-py27-noembed
- TASK=test-pypy
- TASK=test-py36
- TASK=lint-py27
#- TASK=test-pypy3
- TASK=test-pypy3
- TASK=test-py35
#- TASK=test-py278
- TASK=test-py278
- TASK=test-py27
#- TASK=test-py34
#- TASK=test-py27-cffi
- TASK=test-py34
- TASK=test-py27-cffi

matrix:
fast_finish: true
Expand Down
2 changes: 0 additions & 2 deletions _setupares.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ def configure_ares(bext, ext):
with open('configure-output.txt', 'r') as t:
print(t.read(), file=sys.stderr)
raise
with open('configure-output.txt', 'r') as t:
print(t.read(), file=sys.stderr)
if sys.platform == 'darwin':
make_universal_header('ares_build.h', 'CARES_SIZEOF_LONG')
make_universal_header('ares_config.h', 'SIZEOF_LONG', 'SIZEOF_SIZE_T', 'SIZEOF_TIME_T')
Expand Down
13 changes: 13 additions & 0 deletions deps/c-ares/ares_build.h.dist
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,17 @@
typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
#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 */

0 comments on commit 8af3a35

Please sign in to comment.