at 17.09-beta 30 lines 1.4 kB view raw
1diff -Naur ProCaptureForLinux_3269/src/sources/avstream/capture.c ProCaptureForLinux_3269_new/src/sources/avstream/capture.c 2--- ProCaptureForLinux_3269/src/sources/avstream/capture.c 2016-12-12 17:17:18.000000000 -0800 3+++ ProCaptureForLinux_3269_new/src/sources/avstream/capture.c 2017-05-02 23:58:28.270827491 -0700 4@@ -154,7 +154,9 @@ 5 if (IS_ERR_OR_NULL(fp)) 6 return IS_ERR(fp) ? PTR_ERR(fp) : -1; 7 8-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) 9+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) 10+ ret = vfs_getattr(&fp->f_path, &stat, STATX_BASIC_STATS, AT_STATX_SYNC_AS_STAT); 11+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) 12 ret = vfs_getattr(&fp->f_path, &stat); 13 #else 14 ret = vfs_getattr(fp->f_path.mnt, fp->f_path.dentry, &stat); 15diff -Naur ProCaptureForLinux_3269/src/sources/ospi/ospi-linux.c ProCaptureForLinux_3269_new/src/sources/ospi/ospi-linux.c 16--- ProCaptureForLinux_3269/src/sources/ospi/ospi-linux.c 2016-12-12 17:17:18.000000000 -0800 17+++ ProCaptureForLinux_3269_new/src/sources/ospi/ospi-linux.c 2017-05-02 23:51:02.197633628 -0700 18@@ -21,6 +21,12 @@ 19 #include <linux/freezer.h> 20 #include <linux/pci.h> 21 22+// some functions were moved from linux/sched.h out to their own headers in 4.11.x 23+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) 24+#include <linux/sched/signal.h> 25+#include <linux/sched/debug.h> 26+#endif 27+ 28 unsigned int debug_level = 0; 29 30 struct kmem_cache *g_spin_cache = NULL;