diff options
author | Thom Johansen <thomj@rockbox.org> | 2006-03-23 00:52:12 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2006-03-23 00:52:12 +0000 |
commit | d6877bc9ae594a7c6dbf125e602bf72d9a528813 (patch) | |
tree | 2f58c114f040de73c9befbeabf904389ef4f4205 /apps/codecs/libmad/mad.h | |
parent | 8bedb5c510d9e329600ec4c5de050e58be51fa42 (diff) | |
download | rockbox-d6877bc9ae594a7c6dbf125e602bf72d9a528813.tar.gz rockbox-d6877bc9ae594a7c6dbf125e602bf72d9a528813.zip |
Make libmad use inttypes.h types and remove the old ad-hoc typedefs.
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
Diffstat (limited to 'apps/codecs/libmad/mad.h')
-rw-r--r-- | apps/codecs/libmad/mad.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/apps/codecs/libmad/mad.h b/apps/codecs/libmad/mad.h index 9ef6cc8f70..f5d8f1dbcc 100644 --- a/apps/codecs/libmad/mad.h +++ b/apps/codecs/libmad/mad.h | |||
@@ -20,19 +20,14 @@ | |||
20 | * so by contacting: Underbit Technologies, Inc. <info@underbit.com> | 20 | * so by contacting: Underbit Technologies, Inc. <info@underbit.com> |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <inttypes.h> | ||
24 | |||
23 | # ifdef __cplusplus | 25 | # ifdef __cplusplus |
24 | extern "C" { | 26 | extern "C" { |
25 | # endif | 27 | # endif |
26 | 28 | ||
27 | # define FPM_INTEL | 29 | # define FPM_DEFAULT |
28 | 30 | ||
29 | |||
30 | |||
31 | # define SIZEOF_INT 4 | ||
32 | # define SIZEOF_LONG 4 | ||
33 | # define SIZEOF_LONG_LONG 8 | ||
34 | |||
35 | |||
36 | /* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */ | 31 | /* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */ |
37 | 32 | ||
38 | # ifndef LIBMAD_VERSION_H | 33 | # ifndef LIBMAD_VERSION_H |
@@ -67,17 +62,10 @@ extern char const mad_build[]; | |||
67 | # ifndef LIBMAD_FIXED_H | 62 | # ifndef LIBMAD_FIXED_H |
68 | # define LIBMAD_FIXED_H | 63 | # define LIBMAD_FIXED_H |
69 | 64 | ||
70 | # if SIZEOF_INT >= 4 | 65 | typedef int32_t mad_fixed_t; |
71 | typedef signed int mad_fixed_t; | ||
72 | |||
73 | typedef signed int mad_fixed64hi_t; | ||
74 | typedef unsigned int mad_fixed64lo_t; | ||
75 | # else | ||
76 | typedef signed long mad_fixed_t; | ||
77 | 66 | ||
78 | typedef signed long mad_fixed64hi_t; | 67 | typedef int32_t mad_fixed64hi_t; |
79 | typedef unsigned long mad_fixed64lo_t; | 68 | typedef uint32_t mad_fixed64lo_t; |
80 | # endif | ||
81 | 69 | ||
82 | # if defined(_MSC_VER) | 70 | # if defined(_MSC_VER) |
83 | # define mad_fixed64_t signed __int64 | 71 | # define mad_fixed64_t signed __int64 |