Changeset 309 in vbox

Timestamp:

Jan 25, 2007 3:57:38 PM (18 years ago)

Author:

vboxsync

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

17858

Message:

DECLINLINE is supposed to be static of course.

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp (modified) (3 diffs)

trunk/include/iprt/cdefs.h

@@ -430 +430 @@
  * @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 +457 @@
 /** @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)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp

@@ -72 +72 @@
 }
 
-static DECLINLINE(int) vbglHandleHeapEnter (void)
+DECLINLINE(int) vbglHandleHeapEnter (void)
 {
     int rc = RTSemFastMutexRequest(g_vbgldata.mutexHGCMHandle);
@@ -82 +82 @@
 }
 
-static DECLINLINE(void) vbglHandleHeapLeave (void)
+DECLINLINE(void) vbglHandleHeapLeave (void)
 {
     RTSemFastMutexRelease(g_vbgldata.mutexHGCMHandle);

trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp

@@ -156 +156 @@
 
 
-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 +171 @@
 }
 
-static DECLINLINE(int) vbglPhysHeapEnter (void)
+DECLINLINE(int) vbglPhysHeapEnter (void)
 {
     int rc = RTSemFastMutexRequest(g_vbgldata.mutexHeap);
@@ -181 +181 @@
 }
 
-static DECLINLINE(void) vbglPhysHeapLeave (void)
+DECLINLINE(void) vbglPhysHeapLeave (void)
 {
     RTSemFastMutexRelease(g_vbgldata.mutexHeap);