Changed name to avoid conflict with MacOS Classic headers

libsdl-org · May 14, 2006 · 33c472c · 33c472c
1 parent 5df0ab2
commit 33c472c
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/timidity/common.c b/timidity/common.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "common.h"
 #include "output.h"
-#include "controls.h"
+#include "ctrlmode.h"
 
 /* I guess "rb" should be right for any libc */
 #define OPEN_MODE "rb"

diff --git a/timidity/controls.c → timidity/ctrlmode.c b/timidity/controls.c → timidity/ctrlmode.c
@@ -17,12 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-   controls.c
+   ctrlmode.c
    
    */
 
 #include "config.h"
-#include "controls.h"
+#include "ctrlmode.h"
 
 #ifdef SDL
   extern ControlMode sdl_control_mode;

diff --git a/timidity/controls.h → timidity/ctrlmode.h b/timidity/controls.h → timidity/ctrlmode.h
diff --git a/timidity/filter.c b/timidity/filter.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include "config.h"
 #include "common.h"
-#include "controls.h"
+#include "ctrlmode.h"
 #include "instrum.h"
 #include "filter.h"
 

diff --git a/timidity/instrum.c b/timidity/instrum.c
@@ -32,7 +32,7 @@
 #include "instrum.h"
 #include "playmidi.h"
 #include "output.h"
-#include "controls.h"
+#include "ctrlmode.h"
 #include "resample.h"
 #include "tables.h"
 #include "filter.h"

diff --git a/timidity/mix.c b/timidity/mix.c
@@ -30,7 +30,7 @@
 #include "instrum.h"
 #include "playmidi.h"
 #include "output.h"
-#include "controls.h"
+#include "ctrlmode.h"
 #include "tables.h"
 #include "resample.h"
 #include "mix.h"

diff --git a/timidity/playmidi.c b/timidity/playmidi.c
@@ -34,7 +34,7 @@
 #include "readmidi.h"
 #include "output.h"
 #include "mix.h"
-#include "controls.h"
+#include "ctrlmode.h"
 #include "timidity.h"
 
 #include "tables.h"

diff --git a/timidity/readmidi.c b/timidity/readmidi.c
@@ -32,7 +32,7 @@
 #include "playmidi.h"
 #include "readmidi.h"
 #include "output.h"
-#include "controls.h"
+#include "ctrlmode.h"
 
 int32 quietchannels=0;
 

diff --git a/timidity/resample.c b/timidity/resample.c
@@ -29,7 +29,7 @@
 #include "instrum.h"
 #include "playmidi.h"
 #include "output.h"
-#include "controls.h"
+#include "ctrlmode.h"
 #include "tables.h"
 #include "resample.h"
 

diff --git a/timidity/sdl_c.c b/timidity/sdl_c.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "common.h"
 #include "output.h"
-#include "controls.h"
+#include "ctrlmode.h"
 #include "instrum.h"
 #include "playmidi.h"
 

diff --git a/timidity/timidity.c b/timidity/timidity.c
@@ -29,7 +29,7 @@
 #include "playmidi.h"
 #include "readmidi.h"
 #include "output.h"
-#include "controls.h"
+#include "ctrlmode.h"
 #include "timidity.h"
 
 #include "tables.h"