diff -pur iscsitarget-0.4.14.orig/kernel/iscsi_hdr.h iscsitarget-0.4.14/kernel/iscsi_hdr.h
--- iscsitarget-0.4.14.orig/kernel/iscsi_hdr.h	2005-11-28 07:43:23.000000000 +0100
+++ iscsitarget-0.4.14/kernel/iscsi_hdr.h	2007-03-09 14:15:36.000000000 +0100
@@ -12,7 +12,9 @@
 
 #define ISCSI_VERSION			0
 
+#ifndef __packed
 #define __packed __attribute__ ((packed))
+#endif
 
 struct iscsi_hdr {
 	u8  opcode;			/* 0 */
diff -pur iscsitarget-0.4.14.orig/usr/isns.c iscsitarget-0.4.14/usr/isns.c
--- iscsitarget-0.4.14.orig/usr/isns.c	2006-09-25 11:08:51.000000000 +0200
+++ iscsitarget-0.4.14/usr/isns.c	2007-03-09 14:16:01.000000000 +0100
@@ -223,7 +223,7 @@ static int isns_scn_deregister(char *nam
 	x = (x & 0x0000ffff) << 16 | (x & 0xffff0000) >> 16;	\
 }
 #else
-#define set_scn_flag(x)
+#define set_scn_flag(x) (x)
 #endif
 
 static int isns_scn_register(void)