1 --- avifile-0.7-0.7.41/include/utils.h.orig 2002-09-24 09:19:22.000000000 +0200
2 +++ avifile-0.7-0.7.41/include/utils.h 2004-12-05 03:48:50.781020072 +0100
4 * function to retrieve/store data in machine independent format
5 * - right now dump implementation - as we could check functionality
7 -static inline uint16_t avm_get_le16(const void* p) __THROW {
8 +static inline uint16_t __NTH(avm_get_le16(const void* p)) {
10 const uint8_t* c = (const uint8_t*) p;
11 return c[0] | c[1] << 8;
16 -static inline uint8_t* avm_set_le16(void* p, uint16_t v) __THROW {
17 +static inline uint8_t* __NTH(avm_set_le16(void* p, uint16_t v)) {
18 uint8_t* b = (uint8_t*) p;
19 #ifdef WORDS_BIGENDIAN
25 -static inline uint32_t avm_get_le32(const void* p) __THROW {
26 +static inline uint32_t __NTH(avm_get_le32(const void* p)) {
27 #ifdef WORDS_BIGENDIAN
28 const uint8_t* c = (const uint8_t*) p;
29 return c[0] | c[1] << 8 | c[2] << 16 | c[3] << 24;
34 -static inline uint8_t* avm_set_le32(void* p, uint32_t v) __THROW {
35 +static inline uint8_t* __NTH(avm_set_le32(void* p, uint32_t v)) {
36 uint8_t* b = (uint8_t*) p;
37 #ifdef WORDS_BIGENDIAN
43 -static inline uint64_t avm_get_le64(const void* p) __THROW {
44 +static inline uint64_t __NTH(avm_get_le64(const void* p)) {
45 #ifdef WORDS_BIGENDIAN
46 const uint8_t* c = (const uint8_t*) p;
47 return avm_get_le32(c) | (((uint64_t)avm_get_le32(c + 4)) << 32);
52 -static inline uint16_t avm_get_be16(const void* p) __THROW {
53 +static inline uint16_t __NTH(avm_get_be16(const void* p)) {
54 #ifdef WORDS_BIGENDIAN
55 return *(const uint16_t*)p;
61 -static inline uint8_t* avm_set_be16(void* p, uint16_t v) __THROW {
62 +static inline uint8_t* __NTH(avm_set_be16(void* p, uint16_t v)) {
63 uint8_t* b = (uint8_t*) p;
64 b[0] = (v >> 8) & 0xff;
69 -static inline uint32_t avm_get_be32(const void* p) __THROW {
70 +static inline uint32_t __NTH(avm_get_be32(const void* p)) {
71 #ifdef WORDS_BIGENDIAN
72 return *(const uint32_t*)p;
78 -static inline uint8_t* avm_set_be32(void* p, uint32_t v) __THROW {
79 +static inline uint8_t* __NTH(avm_set_be32(void* p, uint32_t v)) {
80 uint8_t* b = (uint8_t*) p;
81 b[0] = (v >> 24) & 0xff;
82 b[1] = (v >> 16) & 0xff;
87 -static inline uint64_t avm_get_be64(const void* p) __THROW {
88 +static inline uint64_t __NTH(avm_get_be64(const void* p)) {
89 #ifdef WORDS_BIGENDIAN
90 return *(const uint64_t*)p;
96 -static inline int avm_img_is_rgb(fourcc_t fmt) __THROW
97 +static inline int __NTH(avm_img_is_rgb(fourcc_t fmt))
99 return ((fmt & 0xffffff00) == IMG_FMT_RGB);
101 -static inline int avm_img_is_bgr(fourcc_t fmt) __THROW
102 +static inline int __NTH(avm_img_is_bgr(fourcc_t fmt))
104 return ((fmt & 0xffffff00) == IMG_FMT_BGR);
106 -static inline int avm_img_get_depth(fourcc_t fmt) __THROW
107 +static inline int __NTH(avm_img_get_depth(fourcc_t fmt))
111 --- avifile-0.7-0.7.41/lib/common/fcc_type.c.orig 2002-11-01 12:46:58.000000000 +0100
112 +++ avifile-0.7-0.7.41/lib/common/fcc_type.c 2004-12-05 03:48:14.692506360 +0100
117 -const char* avm_fcc_name(fourcc_t fcc) __THROW
118 +const char* __NTH(avm_fcc_name(fourcc_t fcc))
126 -const char *avm_img_format_name(fourcc_t fmt) __THROW
127 +const char * __NTH(avm_img_format_name(fourcc_t fmt))
129 const struct dts* t = data;
131 --- avifile-0.7-0.7.41/lib/common/utils.c.orig 2002-07-04 20:59:31.000000000 +0200
132 +++ avifile-0.7-0.7.41/lib/common/utils.c 2004-12-05 03:51:28.009117768 +0100
134 uint_t (*localcount)(void);
135 int64_t (*longcount)(void);
137 -WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf) __THROW
138 +WAVEFORMATEX* __NTH(avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf))
140 wf->wFormatTag = avm_get_le16(&wf->wFormatTag);
141 wf->nChannels = avm_get_le16(&wf->nChannels);
146 -BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi) __THROW
147 +BITMAPINFOHEADER* __NTH(avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi))
149 bi->biSize = avm_get_le32(&bi->biSize);
150 bi->biWidth = avm_get_le32(&bi->biWidth);
152 * (Note: on solaris, usleep is not thread-safe)
155 -int avm_usleep(unsigned long delay) __THROW
156 +int __NTH(avm_usleep(unsigned long delay))
161 * Solaris (maybe other operating systems, too) does not have avm_setenv(),
162 * and avm_unsetenv() in libc, provide our own implementation.
164 -int avm_setenv(const char *name, const char *value, int overwrite) __THROW
165 +int __NTH(avm_setenv(const char *name, const char *value, int overwrite))
168 return setenv(name, value, overwrite);
173 -void avm_unsetenv(const char *name) __THROW
174 +void __NTH(avm_unsetenv(const char *name))
178 --- avifile-0.7-0.7.41/lib/common/wave_type.c.orig 2002-11-29 14:09:46.000000000 +0100
179 +++ avifile-0.7-0.7.41/lib/common/wave_type.c 2004-12-05 03:52:52.639252032 +0100
184 -const char* avm_wave_format_name(short fmt) __THROW
185 +const char* __NTH(avm_wave_format_name(short fmt))
187 switch ((unsigned short)fmt)
193 -char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf) __THROW
194 +char* __NTH(avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf))