Update networklayer_tcp.c

src_extra/networklayer_tcp.c

@@ -37,15 +37,15 @@
 #if !defined(_WIN32)
 # include <features.h>
 # if defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ >= 6) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 16)
-#  define fd_set(fd, fds) FD_SET(fd, fds)
-#  define fd_isset(fd, fds) FD_ISSET(fd, fds)
+#  define UA_fd_set(fd, fds) FD_SET(fd, fds)
+#  define UA_fd_isset(fd, fds) FD_ISSET(fd, fds)
 # else
-#  define fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
-#  define fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
+#  define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
+#  define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
 # endif
 #else
-# define fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
-# define fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
+# define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
+# define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
 #endif
 
 #ifdef UA_ENABLE_MULTITHREADING
@@ -237,10 +237,10 @@ ServerNetworkLayerReleaseRecvBuffer(UA_Connection *connection, UA_ByteString *bu
 static UA_Int32
 setFDSet(ServerNetworkLayerTCP *layer, fd_set *fdset) {
     FD_ZERO(fdset);
-    fd_set(layer->serversockfd, fdset);
+    UA_fd_set(layer->serversockfd, fdset);
     UA_Int32 highestfd = layer->serversockfd;
     for(size_t i = 0; i < layer->mappingsSize; i++) {
-        fd_set(layer->mappings[i].sockfd, fdset);
+        UA_fd_set(layer->mappings[i].sockfd, fdset);
         if(layer->mappings[i].sockfd > highestfd)
             highestfd = layer->mappings[i].sockfd;
     }
@@ -371,7 +371,7 @@ ServerNetworkLayerTCP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **jobs, UA_UInt1
     }
 
     /* accept new connections (can only be a single one) */
-    if(fd_isset(layer->serversockfd, &fdset)) {
+    if(UA_fd_isset(layer->serversockfd, &fdset)) {
         resultsize--;
         struct sockaddr_in cli_addr;
         socklen_t cli_len = sizeof(cli_addr);
@@ -395,7 +395,7 @@ ServerNetworkLayerTCP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **jobs, UA_UInt1
     size_t j = 0;
     UA_ByteString buf = UA_BYTESTRING_NULL;
     for(size_t i = 0; i < layer->mappingsSize && j < (size_t)resultsize; i++) {
-        if(!fd_isset(layer->mappings[i].sockfd, &fdset))
+        if(!UA_fd_isset(layer->mappings[i].sockfd, &fdset))
             continue;
         UA_StatusCode retval = socket_recv(layer->mappings[i].connection, &buf, 0);
         if(retval == UA_STATUSCODE_GOOD) {