wok-6.x diff mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch @ rev 17024
usbids: up 20140731
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Thu Aug 14 09:20:02 2014 +0000 (2014-08-14) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/mupen64plus/stuff/ftbfs-gvariant-type-conflicts.patch Thu Aug 14 09:20:02 2014 +0000 1.3 @@ -0,0 +1,27 @@ 1.4 +Description: Fix FTBFS due to glib gvariant type definitions 1.5 +Forwarded: not-needed 1.6 +Bug-Debian: http://bugs.debian.org/577329 1.7 +Author: Sven Eckelmann <sven.eckelmann@gmx.de> 1.8 + 1.9 +--- 1.10 +diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h 1.11 +index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644 1.12 +--- a/rice_video/typedefs.h 1.13 ++++ b/rice_video/typedefs.h 1.14 +@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 1.15 + #ifndef _TYPEDEFS_H_ 1.16 + #define _TYPEDEFS_H_ 1.17 + 1.18 +-#define uchar unsigned char 1.19 +-#define uint16 unsigned short 1.20 +-#define uint32 unsigned int 1.21 +-#define uint64 unsigned long long 1.22 ++#include <stdint.h> 1.23 ++ 1.24 ++typedef uint8_t uchar; 1.25 ++typedef uint16_t uint16; 1.26 ++typedef uint32_t uint32; 1.27 ++typedef uint64_t uint64; 1.28 + 1.29 + typedef unsigned char uint8; 1.30 +