Changeset 54455 in vbox

Timestamp:

Feb 24, 2015 3:18:33 PM (10 years ago)

Author:

vboxsync

Message:

iprt/cdefs.h,VBoxDrvGip.cpp: Using noinline instead of noinline in DECL_NO_INLINE should hopefully fix the issue with linux redefining noinline in a more permanent manner.

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (1 diff)

trunk/include/iprt/cdefs.h

@@ -1159 +1159 @@
  */
 #ifdef __GNUC__
-# define DECL_NO_INLINE(scope,type) __attribute__((noinline)) scope type
+# define DECL_NO_INLINE(scope,type) __attribute__((__noinline__)) scope type
 #elif defined(_MSC_VER)
 # define DECL_NO_INLINE(scope,type) __declspec(noinline) scope type

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -3486 +3486 @@
  * @param   fTimeout            Set if it's a timeout.
  */
-
-/* XXX See linux-3.14/include/linux/compiler-gcc.h:
- *     #define noinline __attribute__((noinline)) */
-#undef noinline
 DECL_NO_INLINE(static, int)
 supdrvMeasureTscDeltaCallbackAbortSyncSetup(PSUPDRVGIPTSCDELTARGS pArgs, PSUPTSCDELTASYNC2 pMySync, bool fIsMaster, bool fTimeout)