summaryrefslogtreecommitdiff
path: root/debian/patches/71_hppa_unaligned_access_fix_458133.diff
diff options
context:
space:
mode:
authorModestas Vainius <modestas@vainius.eu>2008-08-01 18:18:56 +0000
committerModestas Vainius <modestas@vainius.eu>2008-08-01 18:18:56 +0000
commit6458b2f3c71af88792a8763af45123f5eeea87a8 (patch)
tree66c5fb30f385ad0f15deb023ebbc5ceb84b97fdc /debian/patches/71_hppa_unaligned_access_fix_458133.diff
parent3c76152d1d3f8a855bae0f89b3540232f0be1803 (diff)
downloadqt4-x11-6458b2f3c71af88792a8763af45123f5eeea87a8.tar.gz
Update patches for Qt 4.4.1
Diffstat (limited to 'debian/patches/71_hppa_unaligned_access_fix_458133.diff')
-rw-r--r--debian/patches/71_hppa_unaligned_access_fix_458133.diff62
1 files changed, 0 insertions, 62 deletions
diff --git a/debian/patches/71_hppa_unaligned_access_fix_458133.diff b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
index 2402781..3d77bf8 100644
--- a/debian/patches/71_hppa_unaligned_access_fix_458133.diff
+++ b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
@@ -2,68 +2,6 @@ author: Bernhard R. Link <brlink@debian.org>
Fix unaligned access on hppa
---- a/src/corelib/global/qnumeric_p.h
-+++ b/src/corelib/global/qnumeric_p.h
-@@ -64,11 +64,17 @@
- static const unsigned char qt_armfpa_inf_bytes[] = { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 };
- static inline double qt_inf()
- {
-+ union { double d; unsigned char bytes[8]; } val;
-+
- #ifdef QT_ARMFPA
-- return *reinterpret_cast<const double *>(qt_armfpa_inf_bytes);
-+ qMemCopy(val.bytes, qt_armfpa_inf_bytes, 8);
- #else
-- return *reinterpret_cast<const double *>(QSysInfo::ByteOrder == QSysInfo::BigEndian ? qt_be_inf_bytes : qt_le_inf_bytes);
-+ if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-+ qMemCopy(val.bytes, qt_be_inf_bytes, 8);
-+ else
-+ qMemCopy(val.bytes, qt_le_inf_bytes, 8);
- #endif
-+ return val.d;
- }
-
- // Signaling NAN
-@@ -77,11 +83,17 @@
- static const unsigned char qt_armfpa_snan_bytes[] = { 0, 0, 0xf8, 0x7f, 0, 0, 0, 0 };
- static inline double qt_snan()
- {
-+ union { double d; unsigned char bytes[8]; } val;
-+
- #ifdef QT_ARMFPA
-- return *reinterpret_cast<const double *>(qt_armfpa_snan_bytes);
-+ qMemCopy(val.bytes, qt_armfpa_snan_bytes, 8);
- #else
-- return *reinterpret_cast<const double *>(QSysInfo::ByteOrder == QSysInfo::BigEndian ? qt_be_snan_bytes : qt_le_snan_bytes);
-+ if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-+ qMemCopy(val.bytes, qt_be_snan_bytes, 8);
-+ else
-+ qMemCopy(val.bytes, qt_le_snan_bytes, 8);
- #endif
-+ return val.d;
- }
-
- // Quiet NAN
-@@ -90,11 +102,17 @@
- static const unsigned char qt_armfpa_qnan_bytes[] = { 0, 0, 0xf8, 0xff, 0, 0, 0, 0 };
- static inline double qt_qnan()
- {
-+ union { double d; unsigned char bytes[8]; } val;
-+
- #ifdef QT_ARMFPA
-- return *reinterpret_cast<const double *>(qt_armfpa_qnan_bytes);
-+ qMemCopy(val.bytes, qt_armfpa_qnan_bytes, 8);
- #else
-- return *reinterpret_cast<const double *>(QSysInfo::ByteOrder == QSysInfo::BigEndian ? qt_be_qnan_bytes : qt_le_qnan_bytes);
-+ if (QSysInfo::ByteOrder == QSysInfo::BigEndian)
-+ qMemCopy(val.bytes, qt_be_qnan_bytes, 8);
-+ else
-+ qMemCopy(val.bytes, qt_le_qnan_bytes, 8);
- #endif
-+ return val.d;
- }
-
- static inline bool qt_is_inf(double d)
--- a/src/3rdparty/sha1/sha1.cpp
+++ b/src/3rdparty/sha1/sha1.cpp
@@ -151,10 +151,10 @@