← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtualbox/quantal

« back to all changes in this revision

Viewing changes to debian/patches/37-fix-build-gcc47.patch

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-05-29 10:09:31 UTC
  • mfrom: (3.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120529100931-2xayrbh5hyzm6e9p
Tags: 4.1.16-dfsg-1
* New upstream release.
* Drop 37-fix-build-gcc47.patch, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/37-fix-build-gcc47.patch
1
 
Description: Fix FTBFS with gcc 4.7 on i386.
2
 
Origin: upstream, https://www.virtualbox.org/changeset/40420/vbox
3
 
 
4
 
--- a/src/libs/xpcom18a4/xpcom/io/nsFastLoadFile.h
5
 
+++ b/src/libs/xpcom18a4/xpcom/io/nsFastLoadFile.h
6
 
@@ -294,6 +294,6 @@
7
 
     // not call through our overridden Read method -- it calls directly into
8
 
     // the underlying input stream.
9
 
-    NS_IMETHODIMP ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
10
 
-                               PRUint32 aCount, PRUint32 *aResult);
11
 
+    NS_IMETHOD ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
12
 
+                            PRUint32 aCount, PRUint32 *aResult);
13
 
 
14
 
     nsresult ReadHeader(nsFastLoadHeader *aHeader);
15
 
--- a/src/VBox/Runtime/generic/critsect-generic.cpp
16
 
+++ b/src/VBox/Runtime/generic/critsect-generic.cpp
17
 
@@ -455,5 +455,5 @@
18
 
 
19
 
 
20
 
-RTDECL(int) RTCritSectEnterMultipleDebug(size_t cCritSects, PRTCRITSECT *papCritSects, RTUINTPTR uId, RT_SRC_POS_DECL)
21
 
+RTDECL(int) RTCritSectEnterMultipleDebug(size_t cCritSects, PRTCRITSECT *papCritSects, RTHCUINTPTR uId, RT_SRC_POS_DECL)
22
 
 {
23
 
     RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();