diff options
-rw-r--r-- | adb/fdevent.cpp | 4 | ||||
-rw-r--r-- | adb/services.cpp | 2 | ||||
-rw-r--r-- | include/cutils/sockets.h | 2 | ||||
-rw-r--r-- | include/utils/ByteOrder.h | 2 | ||||
-rw-r--r-- | include/utils/FileMap.h | 2 | ||||
-rw-r--r-- | libcutils/record_stream.c | 2 | ||||
-rw-r--r-- | libcutils/socket_inaddr_any_server.c | 2 | ||||
-rw-r--r-- | libcutils/socket_local_client.c | 6 | ||||
-rw-r--r-- | libcutils/socket_local_server.c | 6 | ||||
-rw-r--r-- | libcutils/socket_loopback_client.c | 2 | ||||
-rw-r--r-- | libcutils/socket_loopback_server.c | 2 | ||||
-rw-r--r-- | liblog/log_read.c | 8 | ||||
-rw-r--r-- | libutils/Unicode.cpp | 2 |
13 files changed, 21 insertions, 21 deletions
diff --git a/adb/fdevent.cpp b/adb/fdevent.cpp index 5cd498831..a8abade78 100644 --- a/adb/fdevent.cpp +++ b/adb/fdevent.cpp @@ -234,7 +234,7 @@ static void fdevent_process() #else /* USE_SELECT */ -#ifdef HAVE_WINSOCK +#if defined(_WIN32) #include <winsock2.h> #else #include <sys/select.h> @@ -617,7 +617,7 @@ void fdevent_install(fdevent *fde, int fd, fd_func func, void *arg) fde->func = func; fde->arg = arg; -#ifndef HAVE_WINSOCK +#if !defined(_WIN32) fcntl(fd, F_SETFL, O_NONBLOCK); #endif fdevent_register(fde); diff --git a/adb/services.cpp b/adb/services.cpp index 82efb1c04..708ef42f6 100644 --- a/adb/services.cpp +++ b/adb/services.cpp @@ -443,7 +443,7 @@ int service_to_fd(const char *name) return -1; #endif } -#ifndef HAVE_WINSOCK /* winsock doesn't implement unix domain sockets */ +#if !defined(_WIN32) /* winsock doesn't implement unix domain sockets */ } else if(!strncmp(name, "local:", 6)) { ret = socket_local_client(name + 6, ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM); diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h index 07d1351a9..2d3c743c0 100644 --- a/include/cutils/sockets.h +++ b/include/cutils/sockets.h @@ -23,7 +23,7 @@ #include <string.h> #include <stdbool.h> -#ifdef HAVE_WINSOCK +#if defined(_WIN32) #include <winsock2.h> typedef int socklen_t; #else diff --git a/include/utils/ByteOrder.h b/include/utils/ByteOrder.h index baa3a83dd..44ea13df8 100644 --- a/include/utils/ByteOrder.h +++ b/include/utils/ByteOrder.h @@ -21,7 +21,7 @@ #include <stdint.h> #include <sys/types.h> -#ifdef HAVE_WINSOCK +#if defined(_WIN32) #include <winsock2.h> #else #include <netinet/in.h> diff --git a/include/utils/FileMap.h b/include/utils/FileMap.h index f70fc927e..afd7bfd7b 100644 --- a/include/utils/FileMap.h +++ b/include/utils/FileMap.h @@ -26,7 +26,7 @@ #if defined(__MINGW32__) // Ensure that we always pull in winsock2.h before windows.h -#ifdef HAVE_WINSOCK +#if defined(_WIN32) #include <winsock2.h> #endif #include <windows.h> diff --git a/libcutils/record_stream.c b/libcutils/record_stream.c index 69949047c..2bc4226ed 100644 --- a/libcutils/record_stream.c +++ b/libcutils/record_stream.c @@ -22,7 +22,7 @@ #include <cutils/record_stream.h> #include <string.h> #include <stdint.h> -#ifdef HAVE_WINSOCK +#if defined(_WIN32) #include <winsock2.h> /* for ntohl */ #else #include <netinet/in.h> diff --git a/libcutils/socket_inaddr_any_server.c b/libcutils/socket_inaddr_any_server.c index 6c849de77..7f0ccb8e9 100644 --- a/libcutils/socket_inaddr_any_server.c +++ b/libcutils/socket_inaddr_any_server.c @@ -20,7 +20,7 @@ #include <string.h> #include <unistd.h> -#ifndef HAVE_WINSOCK +#if !defined(_WIN32) #include <sys/socket.h> #include <sys/select.h> #include <sys/types.h> diff --git a/libcutils/socket_local_client.c b/libcutils/socket_local_client.c index 7b42daaee..252614625 100644 --- a/libcutils/socket_local_client.c +++ b/libcutils/socket_local_client.c @@ -22,7 +22,7 @@ #include <cutils/sockets.h> -#ifdef HAVE_WINSOCK +#if defined(_WIN32) int socket_local_client(const char *name, int namespaceId, int type) { @@ -30,7 +30,7 @@ int socket_local_client(const char *name, int namespaceId, int type) return -1; } -#else /* !HAVE_WINSOCK */ +#else /* !_WIN32 */ #include <sys/socket.h> #include <sys/un.h> @@ -165,4 +165,4 @@ int socket_local_client(const char *name, int namespaceId, int type) return s; } -#endif /* !HAVE_WINSOCK */ +#endif /* !_WIN32 */ diff --git a/libcutils/socket_local_server.c b/libcutils/socket_local_server.c index 60eb86b83..c9acdad3e 100644 --- a/libcutils/socket_local_server.c +++ b/libcutils/socket_local_server.c @@ -23,7 +23,7 @@ #include <errno.h> #include <stddef.h> -#ifdef HAVE_WINSOCK +#if defined(_WIN32) int socket_local_server(const char *name, int namespaceId, int type) { @@ -31,7 +31,7 @@ int socket_local_server(const char *name, int namespaceId, int type) return -1; } -#else /* !HAVE_WINSOCK */ +#else /* !_WIN32 */ #include <sys/socket.h> #include <sys/un.h> @@ -123,4 +123,4 @@ int socket_local_server(const char *name, int namespace, int type) return s; } -#endif /* !HAVE_WINSOCK */ +#endif /* !_WIN32 */ diff --git a/libcutils/socket_loopback_client.c b/libcutils/socket_loopback_client.c index 9aed7b7ce..e14cffbe9 100644 --- a/libcutils/socket_loopback_client.c +++ b/libcutils/socket_loopback_client.c @@ -20,7 +20,7 @@ #include <string.h> #include <unistd.h> -#ifndef HAVE_WINSOCK +#if !defined(_WIN32) #include <sys/socket.h> #include <sys/select.h> #include <sys/types.h> diff --git a/libcutils/socket_loopback_server.c b/libcutils/socket_loopback_server.c index 71afce70f..b600e347e 100644 --- a/libcutils/socket_loopback_server.c +++ b/libcutils/socket_loopback_server.c @@ -22,7 +22,7 @@ #define LISTEN_BACKLOG 4 -#ifndef HAVE_WINSOCK +#if !defined(_WIN32) #include <sys/socket.h> #include <sys/select.h> #include <sys/types.h> 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) \ diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp index fb876c91f..6f4b72176 100644 --- a/libutils/Unicode.cpp +++ b/libutils/Unicode.cpp @@ -18,7 +18,7 @@ #include <stddef.h> -#ifdef HAVE_WINSOCK +#if defined(_WIN32) # undef nhtol # undef htonl # undef nhtos |