Changeset 81374 in vbox

Timestamp:

Oct 18, 2019 9:47:55 PM (5 years ago)

Author:

vboxsync

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

134087

Message:

iprt/cdefs.h: doxygen markup interfers with @def X86, AMD64 and PRETTY_FUNCTION, as it takes the double underscores to indicate <strong>X86</strong>. Newer doxygen seems to allow \X86 and such, but the one we have on the build box doesn't grok that. So, deal with it differently to avoid build failures.

File:

• trunk/include/iprt/cdefs.h (modified) (2 diffs)

trunk/include/iprt/cdefs.h

@@ -245 +245 @@
 
 
-/** @def \__X86__
- * Indicates that we're compiling for the X86 architecture.
- * @deprecated
- */
-
-/** @def \__AMD64__
- * Indicates that we're compiling for the AMD64 architecture.
- * @deprecated
- */
 #if !defined(__X86__) && !defined(__AMD64__) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
 # if defined(RT_ARCH_AMD64)
+/** Indicates that we're compiling for the AMD64 architecture.
+ * @deprecated
+ */
 #  define __AMD64__
 # elif defined(RT_ARCH_X86)
+/** Indicates that we're compiling for the X86 architecture.
+ * @deprecated
+ */
 #  define __X86__
 # else
@@ -3724 +3721 @@
 
 
-/** @def \__PRETTY_FUNCTION__
- *  With GNU C we'd like to use the builtin __PRETTY_FUNCTION__, so define that
- *  for the other compilers.
- */
-#if !defined(__GNUC__) && !defined(__PRETTY_FUNCTION__)
-# ifdef _MSC_VER
+#if (!defined(__GNUC__) && !defined(__PRETTY_FUNCTION__)) || defined(DOXYGEN_RUNNING)
+# if defined(_MSC_VER) || defined(DOXYGEN_RUNNING)
+/** With GNU C we'd like to use the builtin __PRETTY_FUNCTION__, so define that
+ * for the other compilers. */
 #  define __PRETTY_FUNCTION__    __FUNCSIG__
 # else