summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-06-19 15:27:15 +0200
committerHaru <haru@dotalux.com>2015-06-19 15:27:15 +0200
commit9bc51d6b4ca04557b240640fb8d95a95081f504d (patch)
tree8c4517829257a8f78144cd717dbbb1da25ba81f5
parentf444c3d53ba473641a8f21601784f83f84cc5ea2 (diff)
downloadhercules-9bc51d6b4ca04557b240640fb8d95a95081f504d.tar.gz
hercules-9bc51d6b4ca04557b240640fb8d95a95081f504d.tar.bz2
hercules-9bc51d6b4ca04557b240640fb8d95a95081f504d.tar.xz
hercules-9bc51d6b4ca04557b240640fb8d95a95081f504d.zip
Follow-up to e81d221
Let doxygen ignore __attribute__ instead of ignoring it at parse time. Signed-off-by: Haru <haru@dotalux.com>
-rwxr-xr-xtools/HPMHookGen/HPMHookGen.pl6
-rw-r--r--tools/HPMHookGen/doxygen.conf2
2 files changed, 2 insertions, 6 deletions
diff --git a/tools/HPMHookGen/HPMHookGen.pl b/tools/HPMHookGen/HPMHookGen.pl
index 9c0660300..a2e0698d3 100755
--- a/tools/HPMHookGen/HPMHookGen.pl
+++ b/tools/HPMHookGen/HPMHookGen.pl
@@ -21,11 +21,7 @@ sub trim($) {
sub parse($$) {
my ($p, $d) = @_;
-
- # Strip gcc attributes
- $p =~ s/\s*__attribute__\s*\(\(.*$//;
- $d =~ s/\s*__attribute__\s*\(\(.*$//;
-
+
$p =~ s/^.*?\)\((.*)\).*$/$1/; # Clean up extra parentheses )(around the arglist)
# Retrieve return type
diff --git a/tools/HPMHookGen/doxygen.conf b/tools/HPMHookGen/doxygen.conf
index b64584846..a8ec66627 100644
--- a/tools/HPMHookGen/doxygen.conf
+++ b/tools/HPMHookGen/doxygen.conf
@@ -178,7 +178,7 @@ EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
-PREDEFINED =
+PREDEFINED = __attribute__(x)=
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = NO
TAGFILES =