Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-10-12 18:13:09 -07:00
2 changed files with 6 additions and 1 deletions
+4
View File
@@ -26,7 +26,11 @@
#include <qla2x_tgt.h>
#include <qla2x_tgt_def.h>
#ifdef INSIDE_KERNEL_TREE
#include <scst/scst_debug.h>
#else
#include <scst_debug.h>
#endif
/* Version numbers, the same as for the kernel */
#define Q2T_VERSION(a, b, c, d) (((a) << 030) + ((b) << 020) + (c) << 010 + (d))
+2 -1
View File
@@ -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]