# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../reiserfsprogs/no-unaligned-header-2.6.18.patch # Copyright (C) 2006 The OpenSDE Project # # More information can be found in the files COPYING and README. # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- --- reiserfsprogs-3.6.19/include/reiserfs_fs.h.orig 2006-09-23 17:08:57.000000000 +0200 +++ reiserfsprogs-3.6.19/include/reiserfs_fs.h 2006-09-23 20:52:13.000000000 +0200 @@ -38,14 +38,14 @@ # define extern_inline #endif -#include - #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 +#define get_unaligned(ptr) \ + ({ __typeof__(*(ptr)) __tmp; memcpy(&__tmp, (ptr), sizeof(*(ptr))); __tmp; }) + +#define put_unaligned(val, ptr) \ + ({ __typeof__(*(ptr)) __tmp = (val); \ + memcpy((ptr), &__tmp, sizeof(*(ptr))); \ + (void)0; }) #endif #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field))