From aedd5210304cc4fb4af45cd07bed6aa5ad483f19 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 12 Aug 2009 18:01:19 +0000 Subject: [PATCH] Joined a few preprocessor statements on a single line that were split over multiple lines such that scripts/generate-kernel-patch and scripts/run-regression-tests can process these. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1041 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index c7319f3f2..1c757f84b 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -2792,8 +2792,7 @@ out: return; } -#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && \ - defined(SCSI_EXEC_REQ_FIFO_DEFINED)) +#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) /* * Can switch to the next dst_sg element, so, to copy to strictly only @@ -2923,12 +2922,9 @@ out: return res; } -#endif /* !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && \ - defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */ +#endif /* !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && \ - !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && \ - defined(SCSI_EXEC_REQ_FIFO_DEFINED)) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && !((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) #include @@ -3314,9 +3310,7 @@ static void blk_rq_unmap_kern_sg(struct request *rq, int err) return; } -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && \ - !(LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && \ - defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */ +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) && !(LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) && defined(SCSI_EXEC_REQ_FIFO_DEFINED)) */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)