removed unnecessary includes from libmodplug.h.

icculus · Mar 20, 2021 · d0340e6 · d0340e6
1 parent fd0325b
commit d0340e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/SDL_sound_internal.h b/src/SDL_sound_internal.h
@@ -89,7 +89,7 @@
  *  SDL_sound that rely on it, though.
  * !!! FIXME: SDL2 supports more channels.
  */
-#define MAX_CHANNELS 2
+#define SOUND_MAX_CHANNELS  2
 
 
 typedef struct __SOUND_DECODERFUNCTIONS__

diff --git a/src/libmodplug/libmodplug.h b/src/libmodplug/libmodplug.h
@@ -9,7 +9,8 @@
 #ifndef _INCL_LIBMODPLUG_H_
 #define _INCL_LIBMODPLUG_H_
 
-#include "SDL.h"
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
 
 #if defined(HAVE_LIBC) && defined(__WATCOMC__) /* Watcom has issues... */
 #define SDL_cos  cos
@@ -32,19 +33,13 @@
 #pragma warning (disable:4514)
 #endif
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
-#include <mmsystem.h> /* for WAVE_FORMAT_PCM */
-#include <stdio.h>
-#include <malloc.h>
-#include <stdint.h>
 
 #else
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 typedef Sint8 CHAR;
 typedef Uint8 UCHAR;
 typedef Uint8* PUCHAR;
@@ -68,7 +63,6 @@ typedef void* PVOID;
 typedef void VOID;
 
 #define LPCTSTR LPCSTR
-#define WAVE_FORMAT_PCM 1
 
 #ifndef FALSE
 #define FALSE	0