diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-29 17:45:24 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-07-29 17:45:24 -0700 |
| commit | adbf442a515c51cb2acb34e20c1d2ea0e843c660 (patch) | |
| tree | 11511aa802e506ae1bfe663e46493d0f04951b40 /liblog | |
| parent | a6597598a0b82759960df09fd173192ca8c82f0c (diff) | |
| download | core-adbf442a515c51cb2acb34e20c1d2ea0e843c660.tar.gz core-adbf442a515c51cb2acb34e20c1d2ea0e843c660.tar.bz2 core-adbf442a515c51cb2acb34e20c1d2ea0e843c660.zip | |
Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I9855b6fe72e2f2f3a8360c0993a67cb988024ee4
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/log_read.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/liblog/log_read.c b/liblog/log_read.c index 9c4af30d0..cfc8a7aca 100644 --- a/liblog/log_read.c +++ b/liblog/log_read.c @@ -37,7 +37,7 @@ /* branchless on many architectures. */ #define min(x,y) ((y) ^ (((x) ^ (y)) & -((x) < (y)))) -#if (defined(USE_MINGW) || defined(HAVE_WINSOCK)) +#if defined(_WIN32) #define WEAK static #else #define WEAK __attribute__((weak)) @@ -48,7 +48,7 @@ /* Private copy of ../libcutils/socket_local_client.c prevent library loops */ -#ifdef HAVE_WINSOCK +#if defined(_WIN32) int WEAK socket_local_client(const char *name, int namespaceId, int type) { @@ -56,7 +56,7 @@ int WEAK socket_local_client(const char *name, int namespaceId, int type) return -ENOSYS; } -#else /* !HAVE_WINSOCK */ +#else /* !_WIN32 */ #include <sys/socket.h> #include <sys/un.h> @@ -193,7 +193,7 @@ int WEAK socket_local_client(const char *name, int namespaceId, int type) return s; } -#endif /* !HAVE_WINSOCK */ +#endif /* !_WIN32 */ /* End of ../libcutils/socket_local_client.c */ #define logger_for_each(logger, logger_list) \ |