summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-04-14 17:19:44 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-04-14 17:19:44 +0100
commit2339bb34dc3fcc155a04abda51df9fa00732df93 (patch)
tree1832d05244d55417fb3505263af74c238ec3c2a2 /doc
parent1860c0e221f617406df80b0d35d22462dbcb9055 (diff)
parentdc36f8d045cf4f723c44766f44c92e1810e37f4f (diff)
downloadxine-lib-2339bb34dc3fcc155a04abda51df9fa00732df93.tar.gz
xine-lib-2339bb34dc3fcc155a04abda51df9fa00732df93.tar.bz2
Merge changes.
Diffstat (limited to 'doc')
-rw-r--r--doc/Doxyfile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 09e016c5b..59f04af46 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -796,7 +796,7 @@ INCLUDE_FILE_PATTERNS =
# instead of the = operator.
PREDEFINED = XINE_COMPILE XINE_PACKED= ATTR_ALIGN(x)=
-PREDEFINED += XINE_PROTECTED=
+PREDEFINED += XINE_PROTECTED= XINE_MALLOC=
# 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.