← Back to branch summary

~ubuntu-branches/ubuntu/vivid/oss4/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/002_fix-linux-oss_native_word.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien NOEL
  • Date: 2012-11-19 11:47:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20121119114724-svu8mq7x3pk64nez
Tags: 4.2-build2007-1
http://bugs.debian.org/630737
http://bugs.debian.org/687086
http://bugs.debian.org/628876
http://bugs.debian.org/675933
http://bugs.debian.org/693657
http://bugs.debian.org/693657
http://bugs.debian.org/587191
http://bugs.debian.org/653374
* New upstream release.
* Acknowledge NMU, thanks Michael Gilbert.
* Add debian/patches/110_ld-as-needed.patch: Rearrange order of linker
  arguments to fix building with "ld --as-needed" (closes: #630737).
* Add missing dependency on dpkg-dev to oss4-dkms and oss4-source
  (closes: #687086).
* Fix typo in the changelog (closes: #628876, #675933)
* Add debian/patches/002_fix-linux-oss_native_word.patch (closes: #693657).
  Thanks to Ben Hutchings.
* Add debian/patches/003_linux-error-logging-fixes.patch (closes: #693657).
  Thanks to Ben Hutchings.
* check for /lib/modules/${kernelver}/build in addition of
  /lib/modules/${kernelver}/source (closes: #587191).
* oss4-dkms.dkms.in: fix 'CLEAN' rules (closes: #653374).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/002_fix-linux-oss_native_word.patch
 
1
From: Ben Hutchings <ben@decadent.org.uk>
 
2
Subject: Fix definition of oss_native_word for Linux
 
3
 
 
4
On x86_64, unsigned long long and unsigned long have the same size,
 
5
but Linux requires status flag variables to have type unsigned long.
 
6
The current definition results in warning such as:
 
7
 
 
8
build/core/oss_core.c: In function 'oss_fp_check':
 
9
build/core/oss_core.c:1862:3: warning: comparison of distinct pointer types lacks a cast [enabled by default]
 
10
 
 
11
---
 
12
--- a/kernel/OS/Linux/wrapper/wrap.h
 
13
+++ b/kernel/OS/Linux/wrapper/wrap.h
 
14
@@ -21,11 +21,7 @@
 
15
 /*
 
16
  * Some integer types
 
17
  */
 
18
-#if defined(__x86_64__)
 
19
-typedef unsigned long long oss_native_word;    /* Same as the address and status register size */
 
20
-#else
 
21
 typedef unsigned long oss_native_word; /* Same as the address and status register size */
 
22
-#endif
 
23
 typedef long long oss_int64_t;                 /* Signed 64 bit integer */
 
24
 typedef unsigned long long oss_uint64_t;       /* Unsigned 64 bit integer */
 
25