Mercurial > mplayer.hg
comparison tremor/tremor.diff @ 15455:5fed6f245cc3
Update with Jindrich's latest change.
| author | diego |
|---|---|
| date | Sat, 14 May 2005 10:05:09 +0000 |
| parents | a98495858305 |
| children | c820ccd4f5eb |
comparison
equal
deleted
inserted
replaced
| 15454:c5963db9e341 | 15455:5fed6f245cc3 |
|---|---|
| 24 struct { | 24 struct { |
| 25 ogg_int32_t hi; | 25 ogg_int32_t hi; |
| 26 diff -ur orig/os_types.h mod-2004-01-05/os_types.h | 26 diff -ur orig/os_types.h mod-2004-01-05/os_types.h |
| 27 --- orig/os_types.h 2005-01-04 16:29:02.000000000 +0100 | 27 --- orig/os_types.h 2005-01-04 16:29:02.000000000 +0100 |
| 28 +++ mod-2004-01-05/os_types.h 2005-01-05 10:39:07.000000000 +0100 | 28 +++ mod-2004-01-05/os_types.h 2005-01-05 10:39:07.000000000 +0100 |
| 29 @@ -32,57 +32,10 @@ | 29 @@ -32,57 +32,11 @@ |
| 30 #define _ogg_realloc realloc | 30 #define _ogg_realloc realloc |
| 31 #define _ogg_free free | 31 #define _ogg_free free |
| 32 | 32 |
| 33 -#ifdef _WIN32 | 33 -#ifdef _WIN32 |
| 34 - | 34 - |
| 83 -# include "config_types.h" | 83 -# include "config_types.h" |
| 84 - | 84 - |
| 85 -#endif | 85 -#endif |
| 86 + typedef int32_t ogg_int32_t; | 86 + typedef int32_t ogg_int32_t; |
| 87 + typedef uint32_t ogg_uint32_t; | 87 + typedef uint32_t ogg_uint32_t; |
| 88 + typedef uint16_t ogg_uint16_t; | |
| 88 + typedef int16_t ogg_int16_t; | 89 + typedef int16_t ogg_int16_t; |
| 89 | 90 |
| 90 #endif /* _OS_TYPES_H */ | 91 #endif /* _OS_TYPES_H */ |