Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make libmad use inttypes.h types and remove the old ad-hoc typedefs.

Browse source 
Makes mpa.c work somewhat better in 64 bit sims, thought there's still
another crash issue.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9199 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thom Johansen 2006-03-23 00:52:12 +00:00
parent 8bedb5c510
commit d6877bc9ae
2 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/codecs/libmad/fixed.h
View file

@ -22,17 +22,12 @@
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
# if SIZEOF_INT >= 4
typedef signed int mad_fixed_t;
#include <inttypes.h>
typedef signed int mad_fixed64hi_t;
typedef unsigned int mad_fixed64lo_t;
# else
typedef signed long mad_fixed_t;
typedef int32_t mad_fixed_t;
typedef signed long mad_fixed64hi_t;
typedef unsigned long mad_fixed64lo_t;
# endif
typedef int32_t mad_fixed64hi_t;
typedef uint32_t mad_fixed64lo_t;
# if defined(_MSC_VER)
# define mad_fixed64_t signed __int64

26
apps/codecs/libmad/mad.h
View file

@ -20,19 +20,14 @@
* so by contacting: Underbit Technologies, Inc. <info@underbit.com>
*/
#include <inttypes.h>
# ifdef __cplusplus
extern "C" {
# endif
# define FPM_INTEL
# define SIZEOF_INT 4
# define SIZEOF_LONG 4
# define SIZEOF_LONG_LONG 8
# define FPM_DEFAULT
/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
# ifndef LIBMAD_VERSION_H
@ -67,17 +62,10 @@ extern char const mad_build[];
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
# if SIZEOF_INT >= 4
typedef signed int mad_fixed_t;
typedef int32_t mad_fixed_t;
typedef signed int mad_fixed64hi_t;
typedef unsigned int mad_fixed64lo_t;
# else
typedef signed long mad_fixed_t;
typedef signed long mad_fixed64hi_t;
typedef unsigned long mad_fixed64lo_t;
# endif
typedef int32_t mad_fixed64hi_t;
typedef uint32_t mad_fixed64lo_t;
# if defined(_MSC_VER)
# define mad_fixed64_t signed __int64