From 89c414ae3f8b2ef7a95a95cacee3c27159884609 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Wed, 23 Jul 2003 05:08:43 +0000
Subject: [PATCH] *** empty log message ***

---
 SDL_mixer.h | 31 +++++++++++++++++--------------
 mixer.c     |  2 +-
 playwave.c  |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/SDL_mixer.h b/SDL_mixer.h
index 38076459..2d7f569b 100644
--- a/SDL_mixer.h
+++ b/SDL_mixer.h
@@ -22,8 +22,8 @@
 
 /* $Id$ */
 
-#ifndef _MIXER_H_
-#define _MIXER_H_
+#ifndef _SDL_mixer_h
+#define _SDL_mixer_h
 
 #include "SDL_types.h"
 #include "SDL_rwops.h"
@@ -39,24 +39,30 @@ extern "C" {
 
 /* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
 */
-#define MIX_MAJOR_VERSION	1
-#define MIX_MINOR_VERSION	2
-#define MIX_PATCHLEVEL		6
+#define SDL_MIXER_MAJOR_VERSION	1
+#define SDL_MIXER_MINOR_VERSION	2
+#define SDL_MIXER_PATCHLEVEL	6
 
 /* This macro can be used to fill a version structure with the compile-time
  * version of the SDL_mixer library.
  */
-#define MIX_VERSION(X)							\
+#define SDL_MIXER_VERSION(X)						\
 {									\
-	(X)->major = MIX_MAJOR_VERSION;					\
-	(X)->minor = MIX_MINOR_VERSION;					\
-	(X)->patch = MIX_PATCHLEVEL;					\
+	(X)->major = SDL_MIXER_MAJOR_VERSION;				\
+	(X)->minor = SDL_MIXER_MINOR_VERSION;				\
+	(X)->patch = SDL_MIXER_PATCHLEVEL;				\
 }
 
+/* Backwards compatibility */
+#define MIX_MAJOR_VERSION	SDL_MIXER_MAJOR_VERSION
+#define MIX_MINOR_VERSION	SDL_MIXER_MINOR_VERSION
+#define MIX_PATCHLEVEL		SDL_MIXER_PATCHLEVEL
+#define MIX_VERSION(X)		SDL_MIXER_VERSION(X)
+
 
 /* This function gets the version of the dynamically linked SDL_mixer library.
    it should NOT be used to fill a version structure, instead you should
-   use the MIX_VERSION() macro.
+   use the SDL_MIXER_VERSION() macro.
  */
 extern DECLSPEC const SDL_version * SDLCALL Mix_Linked_Version(void);
 
@@ -576,7 +582,4 @@ extern DECLSPEC void SDLCALL Mix_CloseAudio(void);
 #endif
 #include "close_code.h"
 
-#endif /* _MIXER_H_ */
-
-/* end of SDL_mixer.h ... */
-
+#endif /* _SDL_mixer_h */
diff --git a/mixer.c b/mixer.c
index 133287ad..3bc469a9 100644
--- a/mixer.c
+++ b/mixer.c
@@ -98,7 +98,7 @@ static void *music_data = NULL;
 const SDL_version *Mix_Linked_Version(void)
 {
 	static SDL_version linked_version;
-	MIX_VERSION(&linked_version);
+	SDL_MIXER_VERSION(&linked_version);
 	return(&linked_version);
 }
 
diff --git a/playwave.c b/playwave.c
index f57fb07c..cf29a087 100644
--- a/playwave.c
+++ b/playwave.c
@@ -103,7 +103,7 @@ static void test_versions(void)
 	linked = SDL_Linked_Version();
 	output_versions("SDL", &compiled, linked);
 
-	MIX_VERSION(&compiled);
+	SDL_MIXER_VERSION(&compiled);
 	linked = Mix_Linked_Version();
 	output_versions("SDL_mixer", &compiled, linked);
 }