oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add #ifndef DOXY guard to generated headers

Browse Source 
cf/make-proto.pl copies Doxygen docs to -private and -protos headers.
We need to either extract these from those files but not source files,
or only from source files but not the generated headers.  This commit
does the latter.
This commit is contained in:
Nicolas Williams
2016-12-14 22:00:29 -06:00
parent 2ebec2e4ec
commit fa2afcc5fc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cf/make-proto.pl
View File

@@ -253,6 +253,7 @@ $private_h = "";
$public_h_header .= "/* This is a generated file */ $public_h_header .= "/* This is a generated file */
#ifndef $block #ifndef $block
#define $block #define $block
#ifndef DOXY
"; ";
if ($oproto) { if ($oproto) {
@@ -450,7 +451,7 @@ $private_h_trailer .= $undepstr;
if ($public_h ne "" && $flags{"header"}) { if ($public_h ne "" && $flags{"header"}) {
$public_h = $public_h_header . $public_h . $public_h = $public_h_header . $public_h .
$public_h_trailer . "#endif /* $block */\n"; $public_h_trailer . "#endif /* DOXY */\n#endif /* $block */\n";
} }
if ($private_h ne "" && $flags{"header"}) { if ($private_h ne "" && $flags{"header"}) {
$private_h = $private_h_header . $private_h . $private_h = $private_h_header . $private_h .

2
doc/doxytmpl.dxy
View File

@@ -213,7 +213,7 @@ EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH =
INCLUDE_FILE_PATTERNS = INCLUDE_FILE_PATTERNS =
PREDEFINED = PREDEFINED = DOXY
EXPAND_AS_DEFINED = EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES SKIP_FUNCTION_MACROS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------