Changeset 56377 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Jun 11, 2015 7:53:12 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100970

Message:

more RT_GCC_EXTENSION required for gcc-5

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias.c (modified) (1 diff)
• libalias/alias_dns.c (modified) (1 diff)
• slirp_state.h (modified) (1 diff)
• socket.c (modified) (11 diffs)

trunk/src/VBox/Devices/Network/slirp/libalias/alias.c

@@ -150 +150 @@
 # include "alias_mod.h"
 
-#define return(x)                                                           \
-do {                                                                        \
-    Log2(("NAT:ALIAS: %s:%d return(%s:%d)\n", __FUNCTION__, __LINE__, #x,(x)));    \
-    return x;                                                               \
-}while(0)
+#define return(x)                                             \
+do {                                                          \
+    Log2(("NAT:ALIAS: %s:%d return(%s:%d)\n",                 \
+          RT_GCC_EXTENSION __FUNCTION__, __LINE__, #x,(x)));  \
+    return x;                                                 \
+} while(0)
 #endif /* VBOX */
 static __inline int

trunk/src/VBox/Devices/Network/slirp/libalias/alias_dns.c

@@ -85 +85 @@
 
     Log(("NAT:%s: ah(dport: %hd, sport: %hd) oaddr:%RTnaipv4 aaddr:%RTnaipv4\n",
-        __FUNCTION__, ntohs(*ah->dport), ntohs(*ah->sport),
+        RT_GCC_EXTENSION __FUNCTION__, ntohs(*ah->dport), ntohs(*ah->sport),
         ah->oaddr, ah->aaddr));
 

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -434 +434 @@
     {                                                                    \
         (sonext) = (so)->so_next;                                        \
-         Log5(("%s:%d Processing so:%R[natsock]\n", __FUNCTION__, __LINE__, (so)));
+         Log5(("%s:%d Processing so:%R[natsock]\n", RT_GCC_EXTENSION __FUNCTION__, __LINE__, (so)));
 # define CONTINUE(label) continue
 # define CONTINUE_NO_UNLOCK(label) continue

trunk/src/VBox/Devices/Network/slirp/socket.c

@@ -254 +254 @@
 
     LogFlow(("soread: so = %R[natsock]\n", so));
-    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", __PRETTY_FUNCTION__, so, sb));
+    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, so, sb));
 
     /*
@@ -321 +321 @@
     nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, (so->so_tcpcb->t_force? MSG_OOB:0));
 #endif
-    Log2(("%s: read(1) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
-    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", __PRETTY_FUNCTION__, so, sb));
+    Log2(("%s: read(1) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
+    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, so, sb));
     if (nn <= 0)
     {
@@ -336 +336 @@
         status = ioctlsocket(so->s, FIONREAD, &pending);
         if (status < 0)
-            Log(("NAT:%s: error in WSAIoctl: %d\n", __PRETTY_FUNCTION__, errno));
+            Log(("NAT:%s: error in WSAIoctl: %d\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, errno));
         if (nn == 0 && (pending != 0))
         {
@@ -358 +358 @@
             /* nn == 0 means peer has performed an orderly shutdown */
             Log2(("%s: disconnected, nn = %d, errno = %d (%s)\n",
-                  __PRETTY_FUNCTION__, nn, errno, strerror(errno)));
+                  RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, errno, strerror(errno)));
             sofcantrcvmore(so);
             if (!fUninitiolizedTemplate)
@@ -407 +407 @@
     }
 
-    Log2(("%s: read(2) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
+    Log2(("%s: read(2) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
 #endif
 
@@ -413 +413 @@
     sb->sb_cc += nn;
     sb->sb_wptr += nn;
-    Log2(("%s: update so_snd (readed nn = %d) %R[sbuf]\n", __PRETTY_FUNCTION__, nn, sb));
+    Log2(("%s: update so_snd (readed nn = %d) %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, sb));
     if (sb->sb_wptr >= (sb->sb_data + sb->sb_datalen))
     {
         sb->sb_wptr -= sb->sb_datalen;
-        Log2(("%s: alter sb_wptr  so_snd = %R[sbuf]\n", __PRETTY_FUNCTION__, sb));
+        Log2(("%s: alter sb_wptr  so_snd = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, sb));
     }
     STAM_PROFILE_STOP(&pData->StatIOread, a);
@@ -543 +543 @@
     STAM_COUNTER_RESET(&pData->StatIOWrite_rest_bytes);
     LogFlowFunc(("so = %R[natsock]\n", so));
-    Log2(("%s: so = %R[natsock] so->so_rcv = %R[sbuf]\n", __PRETTY_FUNCTION__, so, sb));
+    Log2(("%s: so = %R[natsock] so->so_rcv = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, so, sb));
     QSOCKET_LOCK(tcb);
     SOCKET_LOCK(so);
@@ -612 +612 @@
     nn = send(so->s, iov[0].iov_base, iov[0].iov_len, 0);
 #endif
-    Log2(("%s: wrote(1) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
+    Log2(("%s: wrote(1) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
     /* This should never happen, but people tell me it does *shrug* */
     if (   nn < 0
@@ -625 +625 @@
     {
         Log2(("%s: disconnected, so->so_state = %x, errno = %d\n",
-              __PRETTY_FUNCTION__, so->so_state, errno));
+              RT_GCC_EXTENSION __PRETTY_FUNCTION__, so->so_state, errno));
         sofcantsendmore(so);
         tcp_sockclosed(pData, sototcpcb(so));
@@ -648 +648 @@
         });
     }
-    Log2(("%s: wrote(2) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
+    Log2(("%s: wrote(2) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
 #endif
 
@@ -654 +654 @@
     sb->sb_cc -= nn;
     sb->sb_rptr += nn;
-    Log2(("%s: update so_rcv (written nn = %d) %R[sbuf]\n", __PRETTY_FUNCTION__, nn, sb));
+    Log2(("%s: update so_rcv (written nn = %d) %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, sb));
     if (sb->sb_rptr >= (sb->sb_data + sb->sb_datalen))
     {
         sb->sb_rptr -= sb->sb_datalen;
-        Log2(("%s: alter sb_rptr of so_rcv %R[sbuf]\n", __PRETTY_FUNCTION__, sb));
+        Log2(("%s: alter sb_rptr of so_rcv %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, sb));
     }