From 9bc51d6b4ca04557b240640fb8d95a95081f504d Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 19 Jun 2015 15:27:15 +0200 Subject: Follow-up to e81d221 Let doxygen ignore __attribute__ instead of ignoring it at parse time. Signed-off-by: Haru --- tools/HPMHookGen/HPMHookGen.pl | 6 +----- tools/HPMHookGen/doxygen.conf | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'tools/HPMHookGen') 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 = -- cgit v1.2.3-60-g2f50