← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mupen64plus/quantal

« back to all changes in this revision

Viewing changes to debian/patches/ftbfs-gvariant-type-conflicts.path

  • Committer: Bazaar Package Importer
  • Author(s): Sven Eckelmann, Sven Eckelmann, Piotr Ożarowski
  • Date: 2010-05-06 11:34:46 UTC
  • mfrom: (3.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100506113446-jfcd6uk7waudel82
Tags: 1.5+dfsg1-10
http://bugs.debian.org/580480
https://launchpad.net/bugs/575968
[ Sven Eckelmann ]
* debian/patches:
  - Add rsp_ucode2_reset.patch, Reset status of specific ucode2 hacks after
    starting again
  - Add rsp_hle_bigendian.patch, Fix wrong high level emulation of rsp on big
    endian systems
  - Add rice-crash-vendorstring.patch, Don't crash on long OpenGL vendor
    string (Closes: #580480, LP: #575968)

[ Piotr Ożarowski ]
* DMUA flag set to yes

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ftbfs-gvariant-type-conflicts.path
 
1
Description: Fix FTBFS due to glib gvariant type definitions
 
2
Forwarded: not-needed
 
3
Bug-Debian: http://bugs.debian.org/577329
 
4
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
 
5
 
 
6
---
 
7
diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h
 
8
index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644
 
9
--- a/rice_video/typedefs.h
 
10
+++ b/rice_video/typedefs.h
 
11
@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
12
 #ifndef _TYPEDEFS_H_
 
13
 #define _TYPEDEFS_H_
 
14
 
 
15
-#define uchar  unsigned char
 
16
-#define uint16 unsigned short
 
17
-#define uint32 unsigned int
 
18
-#define uint64 unsigned long long
 
19
+#include <stdint.h>
 
20
+
 
21
+typedef uint8_t uchar;
 
22
+typedef uint16_t uint16;
 
23
+typedef uint32_t uint32;
 
24
+typedef uint64_t uint64;
 
25
 
 
26
 typedef unsigned char               uint8;
 
27