diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2017-11-13 20:21:27 -0800 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2017-11-13 20:21:56 -0800 |
| commit | 7f473fa506597c4dce24e6c77f965b211020a615 (patch) | |
| tree | 5563b3db2c8ba3ace90d111aa1a0dd038712f9ba /pkgs/os-specific/linux/mwprocapture | |
| parent | eb85eb5c738701f7c2b0ce32250d09bf0ff00325 (diff) | |
| download | nixpkgs-7f473fa506597c4dce24e6c77f965b211020a615.tar nixpkgs-7f473fa506597c4dce24e6c77f965b211020a615.tar.gz nixpkgs-7f473fa506597c4dce24e6c77f965b211020a615.tar.bz2 nixpkgs-7f473fa506597c4dce24e6c77f965b211020a615.tar.lz nixpkgs-7f473fa506597c4dce24e6c77f965b211020a615.tar.xz nixpkgs-7f473fa506597c4dce24e6c77f965b211020a615.tar.zst nixpkgs-7f473fa506597c4dce24e6c77f965b211020a615.zip | |
mwprocapture: minor correctness fix to 4.14 patch
Diffstat (limited to 'pkgs/os-specific/linux/mwprocapture')
| -rw-r--r-- | pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch index 9de1c093436..6b3e384bfb2 100644 --- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch +++ b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch @@ -1,6 +1,6 @@ diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c --- ProCaptureForLinux_3589/src/sources/ospi/linux-file.c 2017-08-17 02:46:07.000000000 -0700 -+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c 2017-11-13 19:49:46.710616748 -0800 ++++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c 2017-11-13 20:18:50.842947380 -0800 @@ -7,8 +7,8 @@ #include "linux-file.h" @@ -11,7 +11,15 @@ diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLi struct file *linux_file_open(const char *path, int flags, int mode) { -@@ -35,7 +35,7 @@ +@@ -28,27 +28,27 @@ + filp_close(file, NULL); + } + +-ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size) ++ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size) + { + mm_segment_t oldfs; + ssize_t ret; oldfs = get_fs(); set_fs(get_ds()); @@ -20,7 +28,13 @@ diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLi set_fs(oldfs); return ret; -@@ -48,7 +48,7 @@ + } + +-ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size) ++ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size) + { + mm_segment_t oldfs; + ssize_t ret; oldfs = get_fs(); set_fs(get_ds()); |