Changeset 55192 in vbox

Timestamp:

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

Author:

vboxsync

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

99498

Message:

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

Location:

trunk

Files:

• include/iprt/assert.h (modified) (4 diffs)
• include/iprt/cdefs.h (modified) (1 diff)
• src/VBox/Additions/x11/vboxvideo/vboxvideo.h (modified) (1 diff)
• src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c (modified) (1 diff)
• src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h (modified) (1 diff)

trunk/include/iprt/assert.h

@@ -1614 +1614 @@
         if (RT_UNLIKELY(!(expr))) \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertReleasePanic(); \
         } \
@@ -1829 +1829 @@
 #define AssertReleaseMsgFailed(a)  \
     do { \
-        RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+        RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
         RTAssertMsg2Weak a; \
         RTAssertReleasePanic(); \
@@ -1940 +1940 @@
         for (;;) \
         { \
-            RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertReleasePanic(); \
         } \
@@ -1954 +1954 @@
         for (;;) \
         { \
-            RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertMsg2Weak a; \
             RTAssertReleasePanic(); \

trunk/include/iprt/cdefs.h

@@ -2638 +2638 @@
 
 /** Source position. */
-#define RT_SRC_POS         __FILE__, __LINE__, __PRETTY_FUNCTION__
+#define RT_SRC_POS         __FILE__, __LINE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__
 
 /** Source position declaration. */

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