Mercurial > audlegacy-plugins
changeset 1949:98893c1e9f98
Branch merge.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 02 Oct 2007 00:53:58 +0300 |
| parents | 66fb09cd894e (current diff) a98c54cb96aa (diff) |
| children | 2ebeb7816c5e |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/modplug/modplugbmp.cxx Tue Oct 02 00:50:48 2007 +0300 +++ b/src/modplug/modplugbmp.cxx Tue Oct 02 00:53:58 2007 +0300 @@ -14,12 +14,9 @@ #include "stddefs.h" #include "archive/open.h" extern "C" { -#include "audacious/configdb.h" -#include "audacious/output.h" -#include "audacious/tuple.h" -#include "audacious/tuple_formatter.h" -#include "audacious/vfs.h" -#include "audacious/strings.h" +#include <audacious/configdb.h> +#include <audacious/output.h> +#include <audacious/strings.h> } static char* format_and_free_ti( Tuple* ti, int* length )
--- a/src/modplug/modplugbmp.h Tue Oct 02 00:50:48 2007 +0300 +++ b/src/modplug/modplugbmp.h Tue Oct 02 00:53:58 2007 +0300 @@ -15,9 +15,7 @@ #endif extern "C" { -#include "audacious/plugin.h" -#include "audacious/tuple.h" -#include "audacious/tuple_formatter.h" +#include <audacious/plugin.h> } /* Module files have their magic deep inside the file, at offset 1080; source: http://www.onicos.com/staff/iz/formats/mod.html and information by Michael Doering from UADE */
--- a/src/modplug/plugin.cxx Tue Oct 02 00:50:48 2007 +0300 +++ b/src/modplug/plugin.cxx Tue Oct 02 00:53:58 2007 +0300 @@ -7,9 +7,7 @@ #include "modplug.h" #include "gui/main.h" extern "C" { -#include "audacious/plugin.h" -#include "audacious/tuple.h" -#include "audacious/tuple_formatter.h" +#include <audacious/plugin.h> } extern InputPlugin gModPlug;