aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-19 11:44:41 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-19 11:44:41 +0000
commit0dbb829300763db113c1a52f47af8ea655f72cd2 (patch)
treeadec09aa9ec8f216728b11aae68a6f519b249d0d
parent8f183d3a5aa71ecec3b11492a612667a1de75165 (diff)
downloadpaludis-0dbb829300763db113c1a52f47af8ea655f72cd2.tar.gz
paludis-0dbb829300763db113c1a52f47af8ea655f72cd2.tar.xz
Doxygen doesn't really like __attribute__
-rw-r--r--doc/api/cplusplus/doxygen.conf.in2
-rw-r--r--paludis/util/attributes.hh6
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/cplusplus/doxygen.conf.in b/doc/api/cplusplus/doxygen.conf.in
index b2a6493..f94f907 100644
--- a/doc/api/cplusplus/doxygen.conf.in
+++ b/doc/api/cplusplus/doxygen.conf.in
@@ -1054,7 +1054,7 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
-PREDEFINED = DOXYGEN=1 PALUDIS_VISIBLE=
+PREDEFINED = DOXYGEN=1
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
diff --git a/paludis/util/attributes.hh b/paludis/util/attributes.hh
index 28a1a83..951dd62 100644
--- a/paludis/util/attributes.hh
+++ b/paludis/util/attributes.hh
@@ -56,11 +56,11 @@
* \ingroup g_utils
*/
-#if (defined(__GNUC__) || defined(DOXYGEN))
+#if (defined(__GNUC__) && ! defined(DOXYGEN))
# if defined(__ICC)
# define PALUDIS_ATTRIBUTE(x)
# else
-# if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || defined(DOXYGEN))
+# if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
# define PALUDIS_ATTRIBUTE(x) __attribute__(x)
# define PALUDIS_CAN_USE_ATTRIBUTE 1
# else
@@ -71,7 +71,7 @@
# define PALUDIS_ATTRIBUTE(x)
#endif
-#ifdef PALUDIS_ENABLE_VISIBILITY
+#if (defined(PALUDIS_ENABLE_VISIBILITY) && ! defined(DOXYGEN))
# define PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((visibility("default")))
# define PALUDIS_HIDDEN PALUDIS_ATTRIBUTE((visibility("hidden")))
#else