rpms/reiserfs-utils/devel header-fix.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/reiserfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7752

Modified Files:
	header-fix.patch 
Log Message:
better fix


header-fix.patch:
 reiserfs_fs.h |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

Index: header-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/header-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header-fix.patch	5 Jun 2006 22:06:02 -0000	1.1
+++ header-fix.patch	5 Jun 2006 23:32:25 -0000	1.2
@@ -1,11 +1,33 @@
---- reiserfsprogs-3.6.19/include/reiserfs_fs.h~	2006-06-05 18:00:51.000000000 -0400
-+++ reiserfsprogs-3.6.19/include/reiserfs_fs.h	2006-06-05 18:01:01.000000000 -0400
-@@ -38,8 +38,6 @@
+--- reiserfsprogs-3.6.19/include/reiserfs_fs.h~	2006-06-05 19:29:45.240611000 -0400
++++ reiserfsprogs-3.6.19/include/reiserfs_fs.h	2006-06-05 19:30:29.588212000 -0400
+@@ -38,15 +38,22 @@
  # define extern_inline
  #endif
  
 -#include <asm/unaligned.h>
--
- #ifndef get_unaligned
- #if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
-     defined(__PPC) || defined(powerpc) || defined(__powerpc__)
++#define get_unaligned(ptr)                  \
++({                                             \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v;                               \
++})
++
++#define put_unaligned(val, ptr)             \
++do {                                           \
++	struct __attribute__((packed)) {        \
++	typeof(*(ptr)) __v;             \
++	}  *__p = (void *)(ptr);                \
++	__p->__v = (val);                       \
++} while(0)
+ 
+-#ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+-    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+-#	define get_unaligned(ptr)	(*(ptr))
+-#	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
+-#endif
+-#endif
+ 
+ #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))
+ #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)