Changeset 55192 in vbox for trunk/src/VBox

Timestamp:

Apr 10, 2015 5:43:53 PM (10 years ago)

Author:

vboxsync

Message:

gcc 5 is very picky regarding FUNCTION and PRETTY_FUNCTION in C90 code

Location:

trunk/src/VBox

Files:

• Additions/x11/vboxvideo/vboxvideo.h (modified) (1 diff)
• Additions/x11/vboxvideo/vboxvideo_dri.c (modified) (1 diff)
• Devices/Network/slirp/bsd/sys/mbuf.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -91 +91 @@
     vbvxMsg("\nAssertion failed!\n\n"); \
     vbvxMsg("%s\n", #expr); \
-    vbvxMsg("at %s (%s:%d)\n", __PRETTY_FUNCTION__, __FILE__, __LINE__); \
+    vbvxMsg("at %s (%s:%d)\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, __FILE__, __LINE__); \
     vbvxMsg out; \
     vbvxAbortServer(); \

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c

@@ -182 +182 @@
     {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: preconditions failed\n",
-                   __PRETTY_FUNCTION__);
+                   RT_GCC_EXTENSION __PRETTY_FUNCTION__);
         rc = FALSE;
     }

trunk/src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h

@@ -61 +61 @@
 }
 /* for non-gnu compilers */
-# define __func__ __FUNCTION__
+# define __func__ RT_GCC_EXTENSION __FUNCTION__
 # ifndef __inline
 #  define __inline