Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44443bea authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Use _WIN32 rather than HAVE_WINSOCK."

parents b10e562b adbf442a

adb/fdevent.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

adb/services.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/cutils/sockets.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <string.h>

#include <stdbool.h>



#ifdef HAVE_WINSOCK

#if defined(_WIN32)

#include <winsock2.h>

typedef int  socklen_t;

#else

include/utils/ByteOrder.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

include/utils/FileMap.h

+1 −1
Original line number Diff line number Diff line
@@ -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>