# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1209395722 -10800
# Node ID d137e1c827baa35323036b45a39a7dadd73cbc4e
# Parent  1d93fa7b303708e9da3e4db806aa3bad4e61a6a3# Parent  f791c889f74c7598e2e7fc24705c45933f97e72c
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r f791c889f74c -r d137e1c827ba src/modplug/modplugbmp.h
--- a/src/modplug/modplugbmp.h	Mon Apr 28 16:46:35 2008 +0300
+++ b/src/modplug/modplugbmp.h	Mon Apr 28 18:15:22 2008 +0300
@@ -9,10 +9,7 @@
 
 #include <string>
 #include <glib.h>
-
-#ifndef __MODPLUGXMMS_STDDEFS_H__INCLUDED__
 #include "stddefs.h"
-#endif
 
 extern "C" {
 #include <audacious/plugin.h>
diff -r f791c889f74c -r d137e1c827ba src/modplug/tables.cxx
--- a/src/modplug/tables.cxx	Mon Apr 28 16:46:35 2008 +0300
+++ b/src/modplug/tables.cxx	Mon Apr 28 18:15:22 2008 +0300
@@ -7,10 +7,6 @@
 #include "stdafx.h"
 #include "sndfile.h"
 
-#ifndef MODPLUG_FASTSOUNDLIB
-//#pragma data_seg(".tables")
-#endif
-
 BYTE ImpulseTrackerPortaVolCmd[16] =
 {
 	0x00, 0x01, 0x04, 0x08, 0x10, 0x20, 0x40, 0x60,