wok annotate mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch @ rev 11128
Up: xplanet to 1.2.2.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Wed Oct 26 20:31:21 2011 +0000 (2011-10-26) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@6800 | 1 Description: Fix FTBFS due to glib gvariant type definitions |
| slaxemulator@6800 | 2 Forwarded: not-needed |
| slaxemulator@6800 | 3 Bug-Debian: http://bugs.debian.org/577329 |
| slaxemulator@6800 | 4 Author: Sven Eckelmann <sven.eckelmann@gmx.de> |
| slaxemulator@6800 | 5 |
| slaxemulator@6800 | 6 --- |
| slaxemulator@6800 | 7 diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h |
| slaxemulator@6800 | 8 index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644 |
| slaxemulator@6800 | 9 --- a/rice_video/typedefs.h |
| slaxemulator@6800 | 10 +++ b/rice_video/typedefs.h |
| slaxemulator@6800 | 11 @@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| slaxemulator@6800 | 12 #ifndef _TYPEDEFS_H_ |
| slaxemulator@6800 | 13 #define _TYPEDEFS_H_ |
| slaxemulator@6800 | 14 |
| slaxemulator@6800 | 15 -#define uchar unsigned char |
| slaxemulator@6800 | 16 -#define uint16 unsigned short |
| slaxemulator@6800 | 17 -#define uint32 unsigned int |
| slaxemulator@6800 | 18 -#define uint64 unsigned long long |
| slaxemulator@6800 | 19 +#include <stdint.h> |
| slaxemulator@6800 | 20 + |
| slaxemulator@6800 | 21 +typedef uint8_t uchar; |
| slaxemulator@6800 | 22 +typedef uint16_t uint16; |
| slaxemulator@6800 | 23 +typedef uint32_t uint32; |
| slaxemulator@6800 | 24 +typedef uint64_t uint64; |
| slaxemulator@6800 | 25 |
| slaxemulator@6800 | 26 typedef unsigned char uint8; |
| slaxemulator@6800 | 27 |