From 3d7ecc4fe31491abae8bfd30a4cdaabc98e08e30 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 3 Sep 2014 13:52:16 +0000
Subject: [PATCH] scst.h: RHEL 5.10 build fix

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5760 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scst/include/scst.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scst/include/scst.h b/scst/include/scst.h
index e1255de59..339c32934 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -81,10 +81,14 @@ typedef _Bool bool;
 #define false 0
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21) && !defined(RHEL_MAJOR)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+#ifndef __packed
 #define __packed __attribute__((packed))
+#endif
+#ifndef __aligned
 #define __aligned __attribute__((aligned))
 #endif
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
 char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap);