Index: /trunk/include/iprt/cdefs.h
===================================================================
--- /trunk/include/iprt/cdefs.h	(revision 308)
+++ /trunk/include/iprt/cdefs.h	(revision 309)
@@ -430,14 +430,12 @@
  * @param   type    The return type of the function declaration.
  */
-#ifdef __cplusplus
+#ifdef __GNUC__
+# define DECLINLINE(type) static inline type
+#elif defined(__cplusplus)
 # define DECLINLINE(type) inline type
-#else
-# ifdef __GNUC__
-#  define DECLINLINE(type) static inline type
-# elif defined(_MSC_VER)
-#  define DECLINLINE(type) _inline type
-# else
-#  define DECLINLINE(type) inline type
-# endif
+#elif defined(_MSC_VER)
+# define DECLINLINE(type) _inline type
+#else
+# define DECLINLINE(type) inline type
 #endif
 
@@ -459,5 +457,5 @@
 /** @def IN_RT_R3
  * Used to indicate whether we're inside the same link module as
- * the HC Ring-3 Runtime Library.
+ * the HC Ring-3 Runtime Library.  
  */
 /** @def RTR3DECL(type)
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp	(revision 308)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp	(revision 309)
@@ -72,5 +72,5 @@
 }
 
-static DECLINLINE(int) vbglHandleHeapEnter (void)
+DECLINLINE(int) vbglHandleHeapEnter (void)
 {
     int rc = RTSemFastMutexRequest(g_vbgldata.mutexHGCMHandle);
@@ -82,5 +82,5 @@
 }
 
-static DECLINLINE(void) vbglHandleHeapLeave (void)
+DECLINLINE(void) vbglHandleHeapLeave (void)
 {
     RTSemFastMutexRelease(g_vbgldata.mutexHGCMHandle);
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp	(revision 308)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp	(revision 309)
@@ -156,10 +156,10 @@
 
 
-static DECLINLINE(void *) vbglPhysHeapBlock2Data (VBGLPHYSHEAPBLOCK *pBlock)
+DECLINLINE(void *) vbglPhysHeapBlock2Data (VBGLPHYSHEAPBLOCK *pBlock)
 {
     return (void *)(pBlock? (char *)pBlock + sizeof (VBGLPHYSHEAPBLOCK): NULL);
 }
 
-static DECLINLINE(VBGLPHYSHEAPBLOCK *) vbglPhysHeapData2Block (void *p)
+DECLINLINE(VBGLPHYSHEAPBLOCK *) vbglPhysHeapData2Block (void *p)
 {
     VBGLPHYSHEAPBLOCK *pBlock = (VBGLPHYSHEAPBLOCK *)(p? (char *)p - sizeof (VBGLPHYSHEAPBLOCK): NULL);
@@ -171,5 +171,5 @@
 }
 
-static DECLINLINE(int) vbglPhysHeapEnter (void)
+DECLINLINE(int) vbglPhysHeapEnter (void)
 {
     int rc = RTSemFastMutexRequest(g_vbgldata.mutexHeap);
@@ -181,5 +181,5 @@
 }
 
-static DECLINLINE(void) vbglPhysHeapLeave (void)
+DECLINLINE(void) vbglPhysHeapLeave (void)
 {
     RTSemFastMutexRelease(g_vbgldata.mutexHeap);