Google Git
Sign in
android / platform / system / libbase / ec1b1c3
commitec1b1c306f8ac4cffa5ce091771bb1f5df11a126[log] [tgz]
authorBowgo Tsai <bowgotsai@google.com>Tue Sep 17 22:24:38 2019 +0800
committerBowgo Tsai <bowgotsai@google.com>Wed Sep 18 13:06:45 2019 +0800
treead967e34264afe8ed1abc8f46e43dccaead38fb8
parentd47a8d7e157d90ab4a943f3526017dba4670a3c6 [diff]
<android-base/endian.h>: fix interoperability issue

<winsock2.h> has defined htonl(), ntohl(), htons() and ntohs() with
different return type that cannot be replaced by those macro definitions
in <android-base/endian.h>.

Includes <winsock2.h> first to prevent them from being replaced.
Then defines the macro later so we don't need to call into DLL
when using those functions.

Bug: 139639521
Test: m libbase_test && wine out/host/windows-x86/nativetest64/libbase_test/libbase_test64.exe
Test: m checkbuild
Change-Id: I672f23a31c6800df10e04d36695d446bca4c91e9
1 file changed
tree: ad967e34264afe8ed1abc8f46e43dccaead38fb8
  1. include/
  2. .clang-format ⇨ ../.clang-format-2
  3. abi_compatibility.cpp
  4. Android.bp
  5. chrono_utils.cpp
  6. chrono_utils_test.cpp
  7. cmsg.cpp
  8. cmsg_test.cpp
  9. CPPLINT.cfg
  10. endian_test.cpp
  11. errors_test.cpp
  12. errors_unix.cpp
  13. errors_windows.cpp
  14. expected_test.cpp
  15. file.cpp
  16. file_test.cpp
  17. format_benchmark.cpp
  18. logging.cpp
  19. logging_test.cpp
  20. macros_test.cpp
  21. mapped_file.cpp
  22. mapped_file_test.cpp
  23. OWNERS
  24. parsedouble_test.cpp
  25. parseint_test.cpp
  26. parsenetaddress.cpp
  27. parsenetaddress_test.cpp
  28. process.cpp
  29. process_test.cpp
  30. properties.cpp
  31. properties_test.cpp
  32. quick_exit.cpp
  33. quick_exit_test.cpp
  34. result_test.cpp
  35. scopeguard_test.cpp
  36. stringprintf.cpp
  37. stringprintf_test.cpp
  38. strings.cpp
  39. strings_test.cpp
  40. test_main.cpp
  41. test_utils.cpp
  42. test_utils_test.cpp
  43. threads.cpp
  44. utf8.cpp
  45. utf8_test.cpp