diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-03-27 17:42:07 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-03-27 17:42:07 +0300 |
| commit | 0c9ed253893faa13313fee30ce6dbf40a0339035 (patch) | |
| tree | 488b25b9c65c93011c75eb09035db2d5ee2f400f /Doxyfile.in | |
| parent | 6a2ee6bd4acd68ec4f28fa397543079d8cab77cc (diff) | |
| parent | c1c801dcb5e6470e9327195c89ee2da6e505127b (diff) | |
| download | dbus-0c9ed253893faa13313fee30ce6dbf40a0339035.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/pkg-utopia/dbus
Conflicts:
debian/changelog
debian/dbus.postinst
Diffstat (limited to 'Doxyfile.in')
| -rw-r--r-- | Doxyfile.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Doxyfile.in b/Doxyfile.in index afac639b..f0a37eda 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -147,7 +147,6 @@ PREDEFINED = "DBUS_BEGIN_DECLS=" \ "DBUS_END_DECLS=" \ "DOXYGEN_SHOULD_SKIP_THIS" \ "DBUS_GNUC_DEPRECATED=" \ - "_DBUS_DEFINE_GLOBAL_LOCK(name)=" \ "_DBUS_GNUC_PRINTF(from,to)=" SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- |