Changeset 19167 in vbox

Timestamp:

Apr 24, 2009 12:15:18 PM (16 years ago)

Author:

vboxsync

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

46458

Message:

iprt/cdefs.h,RTLdr: Added an generic RT_NOTHING macro to fixing issues like r46334.

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (1 diff)
• src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h (modified) (1 diff)

trunk/include/iprt/cdefs.h

@@ -472 +472 @@
 # define RCSTRING(pRCString)    ("<RC_STRING>")
 #endif
+
+
+/** @def RT_NOTHING
+ * A macro that expands to nothing.
+ * This is primarily intended as a dummy argument for macros to avoid the
+ * undefined behavior passing empty arguments to an macro (ISO C90 and C++98,
+ * gcc v4.4 warns about it).
+ */
+#define RT_NOTHING
 
 

trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

@@ -75 +75 @@
 #define Elf_Word            RTLDRELF_MID(Elf,_Word)
 
-/* gcc-4.4 warning: ''empty macro arguments are undefined in ISO C90 and ISO C++98'' */
-#define NO_SUFFIX
-#define RTLDRMODELF         RTLDRELF_MID(RTLDRMODELF,NO_SUFFIX)
-#define PRTLDRMODELF        RTLDRELF_MID(PRTLDRMODELF,NO_SUFFIX)
-#undef NO_SUFFIX
+#define RTLDRMODELF         RTLDRELF_MID(RTLDRMODELF,RT_NOTHING)
+#define PRTLDRMODELF        RTLDRELF_MID(PRTLDRMODELF,RT_NOTHING)
 
 #define ELF_R_SYM(info)     RTLDRELF_MID(ELF,_R_SYM)(info)