*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Wed, 23 Jul 2003 05:08:43 +0000
changeset 22761b8509257c3
parent 226 3691a375f2e6
child 228 e1333a39a9ed
*** empty log message ***
SDL_mixer.h
mixer.c
playwave.c
     1.1 --- a/SDL_mixer.h	Sat Jun 28 17:31:24 2003 +0000
     1.2 +++ b/SDL_mixer.h	Wed Jul 23 05:08:43 2003 +0000
     1.3 @@ -22,8 +22,8 @@
     1.4  
     1.5  /* $Id$ */
     1.6  
     1.7 -#ifndef _MIXER_H_
     1.8 -#define _MIXER_H_
     1.9 +#ifndef _SDL_mixer_h
    1.10 +#define _SDL_mixer_h
    1.11  
    1.12  #include "SDL_types.h"
    1.13  #include "SDL_rwops.h"
    1.14 @@ -39,24 +39,30 @@
    1.15  
    1.16  /* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
    1.17  */
    1.18 -#define MIX_MAJOR_VERSION	1
    1.19 -#define MIX_MINOR_VERSION	2
    1.20 -#define MIX_PATCHLEVEL		6
    1.21 +#define SDL_MIXER_MAJOR_VERSION	1
    1.22 +#define SDL_MIXER_MINOR_VERSION	2
    1.23 +#define SDL_MIXER_PATCHLEVEL	6
    1.24  
    1.25  /* This macro can be used to fill a version structure with the compile-time
    1.26   * version of the SDL_mixer library.
    1.27   */
    1.28 -#define MIX_VERSION(X)							\
    1.29 +#define SDL_MIXER_VERSION(X)						\
    1.30  {									\
    1.31 -	(X)->major = MIX_MAJOR_VERSION;					\
    1.32 -	(X)->minor = MIX_MINOR_VERSION;					\
    1.33 -	(X)->patch = MIX_PATCHLEVEL;					\
    1.34 +	(X)->major = SDL_MIXER_MAJOR_VERSION;				\
    1.35 +	(X)->minor = SDL_MIXER_MINOR_VERSION;				\
    1.36 +	(X)->patch = SDL_MIXER_PATCHLEVEL;				\
    1.37  }
    1.38  
    1.39 +/* Backwards compatibility */
    1.40 +#define MIX_MAJOR_VERSION	SDL_MIXER_MAJOR_VERSION
    1.41 +#define MIX_MINOR_VERSION	SDL_MIXER_MINOR_VERSION
    1.42 +#define MIX_PATCHLEVEL		SDL_MIXER_PATCHLEVEL
    1.43 +#define MIX_VERSION(X)		SDL_MIXER_VERSION(X)
    1.44 +
    1.45  
    1.46  /* This function gets the version of the dynamically linked SDL_mixer library.
    1.47     it should NOT be used to fill a version structure, instead you should
    1.48 -   use the MIX_VERSION() macro.
    1.49 +   use the SDL_MIXER_VERSION() macro.
    1.50   */
    1.51  extern DECLSPEC const SDL_version * SDLCALL Mix_Linked_Version(void);
    1.52  
    1.53 @@ -576,7 +582,4 @@
    1.54  #endif
    1.55  #include "close_code.h"
    1.56  
    1.57 -#endif /* _MIXER_H_ */
    1.58 -
    1.59 -/* end of SDL_mixer.h ... */
    1.60 -
    1.61 +#endif /* _SDL_mixer_h */
     2.1 --- a/mixer.c	Sat Jun 28 17:31:24 2003 +0000
     2.2 +++ b/mixer.c	Wed Jul 23 05:08:43 2003 +0000
     2.3 @@ -98,7 +98,7 @@
     2.4  const SDL_version *Mix_Linked_Version(void)
     2.5  {
     2.6  	static SDL_version linked_version;
     2.7 -	MIX_VERSION(&linked_version);
     2.8 +	SDL_MIXER_VERSION(&linked_version);
     2.9  	return(&linked_version);
    2.10  }
    2.11  
     3.1 --- a/playwave.c	Sat Jun 28 17:31:24 2003 +0000
     3.2 +++ b/playwave.c	Wed Jul 23 05:08:43 2003 +0000
     3.3 @@ -103,7 +103,7 @@
     3.4  	linked = SDL_Linked_Version();
     3.5  	output_versions("SDL", &compiled, linked);
     3.6  
     3.7 -	MIX_VERSION(&compiled);
     3.8 +	SDL_MIXER_VERSION(&compiled);
     3.9  	linked = Mix_Linked_Version();
    3.10  	output_versions("SDL_mixer", &compiled, linked);
    3.11  }