From 66ee4c73cb4b3bc9c65c7a9590fd534a779d68c2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 25 Nov 2015 17:28:02 +0000 Subject: [PATCH] usr/fileio: Build fix for Ubuntu 15.10 Ubuntu 15.10 includes Linux kernel 4.2 but does not define SERVICE_ACTION_IN_16 in the glibc header. Hence provide a definition in scst_const.h. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6714 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst_const.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index b0a2fc51b..cd213cbee 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -466,10 +466,10 @@ static inline int scst_sense_response_code(const uint8_t *sense) #endif #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) +#ifndef GENERATING_UPSTREAM_PATCH /* * See also patch "scsi: rename SERVICE_ACTION_IN_16 to SERVICE_ACTION_IN_16" - * (commit eb846d9f147455e4e5e1863bfb5e31974bb69b7c). + * (commit eb846d9f147455e4e5e1863bfb5e31974bb69b7c; kernel 3.19.0). */ #ifndef SERVICE_ACTION_IN_16 #define SERVICE_ACTION_IN_16 0x9e