diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-04-28 14:37:17 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-04-28 14:37:17 -0700 |
| commit | 81aae44858dc72a55461486d9ea192db25f4b890 (patch) | |
| tree | 2af2da81809a005a12e175f40b772f45f40bdff8 /third_party/cares | |
| parent | 365c52b47e8d322dfc0bdf15ddea2b598f3b4dbb (diff) | |
| parent | dc36f4df6aba60275a31227e1d29c4d20b6cadca (diff) | |
Merge branch 'v1.3.x' into master-upmerge-v1.3.x
Diffstat (limited to 'third_party/cares')
| -rw-r--r-- | third_party/cares/ares_build.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/cares/ares_build.h b/third_party/cares/ares_build.h index 7d69f1e6ae..d6b3d49f37 100644 --- a/third_party/cares/ares_build.h +++ b/third_party/cares/ares_build.h @@ -251,4 +251,14 @@ typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t; #endif +/* Undefine UNICODE, as c-ares does not use the ANSI version of functions */ +/* explicitly. */ +#ifdef UNICODE +# undef UNICODE +#endif + +#ifdef _UNICODE +# undef _UNICODE +#endif + #endif /* __CARES_BUILD_H */ |