[maemo-commits] [maemo-commits] r12308 - projects/haf/trunk/dosfstools/debian/patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-15 12:59:55 +0300 (Fri, 15 Jun 2007)
New Revision: 12308

Modified:
   projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch
Log:
now the patch should apply...


Modified: projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch
===================================================================
--- projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch	2007-06-15 09:50:28 UTC (rev 12307)
+++ projects/haf/trunk/dosfstools/debian/patches/05-fix-logical-sector-calc.patch	2007-06-15 09:59:55 UTC (rev 12308)
@@ -1,18 +1,20 @@
---- dosfstools-2.11/dosfsck/boot.c.orig 2007-06-13 15:15:36.000000000 +0200
-+++ dosfstools-2.11/dosfsck/boot.c      2007-06-13 15:16:41.000000000 +0200
+diff -pur dosfstools-2.11/dosfsck/boot.c dosfstools-2.11.new/dosfsck/boot.c
+--- dosfstools-2.11/dosfsck/boot.c	2005-03-12 16:16:22.000000000 +0200
++++ dosfstools-2.11.new/dosfsck/boot.c	2007-06-15 12:59:21.897962824 +0300
 @@ -34,13 +34,13 @@ static struct {
      { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" },
  };
-
+ 
 -#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
 +#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ || __arm__
  /* Unaligned fields must first be copied byte-wise */
- #define GET_UNALIGNED_W(f)                     \
-     ({                                         \
-        unsigned short __v;                     \
-        memcpy( &__v, &f, sizeof(__v) );        \
--       CF_LE_W( *(unsigned short *)&f );       \
-+       CF_LE_W( *(unsigned short *)&__v );     \
+ #define GET_UNALIGNED_W(f)			\
+     ({						\
+ 	unsigned short __v;			\
+ 	memcpy( &__v, &f, sizeof(__v) );	\
+-	CF_LE_W( *(unsigned short *)&f );	\
++	CF_LE_W( *(unsigned short *)&__v );	\
      })
  #else
  #define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f )
+Only in dosfstools-2.11.new/dosfsck: boot.c~