diff options
author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/71_hppa_unaligned_access_fix_458133.diff | |
parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
download | qt4-x11-7b37d1bc4f6b27188b0688dcdc2b89db3101575c.tar.gz |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/71_hppa_unaligned_access_fix_458133.diff')
-rw-r--r-- | debian/patches/71_hppa_unaligned_access_fix_458133.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/71_hppa_unaligned_access_fix_458133.diff b/debian/patches/71_hppa_unaligned_access_fix_458133.diff index 4d22cbc..78a0a08 100644 --- a/debian/patches/71_hppa_unaligned_access_fix_458133.diff +++ b/debian/patches/71_hppa_unaligned_access_fix_458133.diff @@ -4,7 +4,7 @@ Fix unaligned access on hppa --- a/src/3rdparty/sha1/sha1.cpp +++ b/src/3rdparty/sha1/sha1.cpp -@@ -145,10 +145,10 @@ static inline void sha1ProcessChunk(Sha1 +@@ -144,10 +144,10 @@ static inline void sha1ProcessChunk(Sha1 quint32 d = state->h3; quint32 e = state->h4; @@ -18,7 +18,7 @@ Fix unaligned access on hppa for (int i = 0; i < 16; ++i) chunk->words[i] = qFromBigEndian(chunk->words[i]); -@@ -184,7 +184,7 @@ static inline void sha1ProcessChunk(Sha1 +@@ -183,7 +183,7 @@ static inline void sha1ProcessChunk(Sha1 // Wipe variables #ifdef SHA1_WIPE_VARIABLES a = b = c = d = e = 0; |