removed more legacy

CMakeLists.txt

@@ -1,93 +1,16 @@
 cmake_minimum_required(VERSION 2.6)
-
 project(enet)
 
-# The "configure" step.
-include(CheckFunctionExists)
-include(CheckStructHasMember)
-include(CheckTypeSize)
-
-check_function_exists("fcntl" HAS_FCNTL)
-check_function_exists("poll" HAS_POLL)
-check_function_exists("getaddrinfo" HAS_GETADDRINFO)
-check_function_exists("getnameinfo" HAS_GETNAMEINFO)
-check_function_exists("gethostbyname_r" HAS_GETHOSTBYNAME_R)
-check_function_exists("gethostbyaddr_r" HAS_GETHOSTBYADDR_R)
-check_function_exists("inet_pton" HAS_INET_PTON)
-check_function_exists("inet_ntop" HAS_INET_NTOP)
-
-check_struct_has_member("struct msghdr" "msg_flags" "sys/types.h;sys/socket.h" HAS_MSGHDR_FLAGS)
-
-set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h" "sys/socket.h")
-check_type_size("socklen_t" HAS_SOCKLEN_T BUILTIN_TYPES_ONLY)
-unset(CMAKE_EXTRA_INCLUDE_FILES)
-
 if(MSVC)
 	add_definitions(-W3)
 else()
 	add_definitions(-Wno-error)
 endif()
 
-if(HAS_FCNTL)
-    add_definitions(-DHAS_FCNTL=1)
-endif()
-if(HAS_POLL)
-    add_definitions(-DHAS_POLL=1)
-endif()
-if(HAS_GETNAMEINFO)
-    add_definitions(-DHAS_GETNAMEINFO=1)
-endif()
-if(HAS_GETADDRINFO)
-    add_definitions(-DHAS_GETADDRINFO=1)
-endif()
-if(HAS_GETHOSTBYNAME_R)
-    add_definitions(-DHAS_GETHOSTBYNAME_R=1)
-endif()
-if(HAS_GETHOSTBYADDR_R)
-    add_definitions(-DHAS_GETHOSTBYADDR_R=1)
-endif()
-if(HAS_INET_PTON)
-    add_definitions(-DHAS_INET_PTON=1)
-endif()
-if(HAS_INET_NTOP)
-    add_definitions(-DHAS_INET_NTOP=1)
-endif()
-if(HAS_MSGHDR_FLAGS)
-    add_definitions(-DHAS_MSGHDR_FLAGS=1)
-endif()
-if(NOT HAS_SOCKLEN_T)
-    add_definitions(-DHAS_NO_SOCKLEN_T=1)
-endif()
-
 if (NOT DEFINED ENET_ONLY_CONFIG)
     include_directories(${PROJECT_SOURCE_DIR}/include)
-
-    set(INCLUDE_FILES_PREFIX include/enet)
-    set(INCLUDE_FILES
-        ${INCLUDE_FILES_PREFIX}/callbacks.h
-        ${INCLUDE_FILES_PREFIX}/enet.h
-        ${INCLUDE_FILES_PREFIX}/list.h
-        ${INCLUDE_FILES_PREFIX}/protocol.h
-        ${INCLUDE_FILES_PREFIX}/time.h
-        ${INCLUDE_FILES_PREFIX}/types.h
-        ${INCLUDE_FILES_PREFIX}/unix.h
-        ${INCLUDE_FILES_PREFIX}/utility.h
-        ${INCLUDE_FILES_PREFIX}/win32.h
-    )
-
-    set(SOURCE_FILES
-        src/callbacks.c
-        src/compress.c
-        src/host.c
-        src/list.c
-        src/packet.c
-        src/peer.c
-        src/protocol.c
-        src/unix.c
-        src/win32.c)
-
+    set(INCLUDE_FILES include/enet.h)
     source_group(include FILES ${INCLUDE_FILES})
-    source_group(source FILES ${SOURCE_FILES})
 
     add_library(enet STATIC
         ${INCLUDE_FILES}

include/enet.h

@@ -91,6 +91,7 @@
     #include <sys/ioctl.h>
     #include <sys/time.h>
     #include <sys/socket.h>
+    #include <sys/poll.h>
     #include <arpa/inet.h>
     #include <netinet/in.h>
     #include <netinet/tcp.h>
@@ -99,32 +100,7 @@
     #include <string.h>
     #include <errno.h>
     #include <time.h>
-
-    #ifdef __APPLE__
-    #ifdef HAS_POLL
-    #undef HAS_POLL
-    #endif
-    #ifndef HAS_FCNTL
-    #define HAS_FCNTL 1
-    #endif
-
-    #ifndef HAS_MSGHDR_FLAGS
-    #define HAS_MSGHDR_FLAGS 1
-    #endif
-
-    #endif // __APPLE__
-
-    #ifdef HAS_FCNTL
     #include <fcntl.h>
-    #endif
-
-    #ifdef HAS_POLL
-    #include <sys/poll.h>
-    #endif
-
-    #ifdef HAS_NO_SOCKLEN_T
-    typedef int socklen_t;
-    #endif
 
     #ifndef MSG_NOSIGNAL
     #define MSG_NOSIGNAL 0
@@ -4945,11 +4921,7 @@ extern "C" {
 
         switch (option) {
             case ENET_SOCKOPT_NONBLOCK:
-                #ifdef HAS_FCNTL
                 result = fcntl(socket, F_SETFL, (value ? O_NONBLOCK : 0) | (fcntl(socket, F_GETFL) & ~O_NONBLOCK));
-                #else
-                result = ioctl(socket, FIONBIO, &value);
-                #endif
                 break;
 
             case ENET_SOCKOPT_BROADCAST:
@@ -5123,11 +5095,9 @@ extern "C" {
             return -1;
         }
 
-        #ifdef HAS_MSGHDR_FLAGS
         if (msgHdr.msg_flags & MSG_TRUNC) {
             return -1;
         }
-        #endif
 
         if (address != NULL) {
             address->host           = sin.sin6_addr;
@@ -5148,7 +5118,6 @@ extern "C" {
     }
 
     int enet_socket_wait(ENetSocket socket, enet_uint32 *condition, enet_uint64 timeout) {
-        #ifdef HAS_POLL
         struct pollfd pollSocket;
         int pollCount;
 
@@ -5190,55 +5159,6 @@ extern "C" {
         }
 
         return 0;
-
-        #else  /* ifdef HAS_POLL */
-        fd_set readSet, writeSet;
-        struct timeval timeVal;
-        int selectCount;
-
-        timeVal.tv_sec  = timeout / 1000;
-        timeVal.tv_usec = (timeout % 1000) * 1000;
-
-        FD_ZERO(&readSet);
-        FD_ZERO(&writeSet);
-
-        if (*condition & ENET_SOCKET_WAIT_SEND) {
-            FD_SET(socket, &writeSet);
-        }
-
-        if (*condition & ENET_SOCKET_WAIT_RECEIVE) {
-            FD_SET(socket, &readSet);
-        }
-
-        selectCount = select(socket + 1, &readSet, &writeSet, NULL, &timeVal);
-
-        if (selectCount < 0) {
-            if (errno == EINTR && *condition & ENET_SOCKET_WAIT_INTERRUPT) {
-                *condition = ENET_SOCKET_WAIT_INTERRUPT;
-
-                return 0;
-            }
-
-            return -1;
-        }
-
-        *condition = ENET_SOCKET_WAIT_NONE;
-
-        if (selectCount == 0) {
-            return 0;
-        }
-
-        if (FD_ISSET(socket, &writeSet)) {
-            *condition |= ENET_SOCKET_WAIT_SEND;
-        }
-
-        if (FD_ISSET(socket, &readSet)) {
-            *condition |= ENET_SOCKET_WAIT_RECEIVE;
-        }
-
-        return 0;
-
-        #endif /* ifdef HAS_POLL */
     } /* enet_socket_wait */
 
     #endif // !_WIN32

misc/ChangeLog

@@ -1,5 +1,3 @@
-* use getaddrinfo and getnameinfo where available
-
 ENet 2.0.0 (April 22, 2018):
 * changed library format to single header
 * applied project-wide code style change