From 8f704cbe838952c7ff85cc8862e298819f9f5680 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 12 Oct 2017 14:56:44 +0000 Subject: [PATCH 1/2] qla2x00t: Fix scst_debug.h include path for the in-tree build git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7254 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla2x00-target/qla2x00t.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h index a398298ea..8580e0153 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.h +++ b/qla2x00t/qla2x00-target/qla2x00t.h @@ -26,7 +26,11 @@ #include #include +#ifdef INSIDE_KERNEL_TREE +#include +#else #include +#endif /* Version numbers, the same as for the kernel */ #define Q2T_VERSION(a, b, c, d) (((a) << 030) + ((b) << 020) + (c) << 010 + (d)) From 7b5dcab494be9ab7a3800b8a367734d3487c32ae Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 12 Oct 2017 15:03:13 +0000 Subject: [PATCH 2/2] scripts/specialize-patch: Fix #elif handling git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7255 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/specialize-patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/specialize-patch b/scripts/specialize-patch index 942ae35f3..4ebea034d 100755 --- a/scripts/specialize-patch +++ b/scripts/specialize-patch @@ -399,11 +399,12 @@ function handle_if(evaluated) if (debug) printf "/* debug specialize-patch: (e) %s */\n", evaluated evaluated = evaluate(evaluated) + sub("^+#if", "+#elif", evaluated); decision[if_nesting_level] = evaluated inv_decision[if_nesting_level] \ = evaluate(sprintf("+#if %s && !%s", \ substr(inv_decision[if_nesting_level], 6), \ - substr(evaluated, 6))) + substr(evaluated, 8))) if (debug) printf "/* debug specialize-patch: (f) %s / %s */\n", \ decision[if_nesting_level], inv_decision[if_nesting_level]