diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-08-22 01:37:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-08-22 01:37:45 -0400 |
| commit | 50c3a5ea8e1dd04641da3a27f98170157621f74e (patch) | |
| tree | 013d885cd1ef17432517fe85743f0b5aa385df14 /libre/xbmc-libre/libnfs-header-changes.patch | |
| parent | 156c9dd23d8ce1cf4aeaec2040b1cf3c47309094 (diff) | |
| parent | dd992ab45849fcef37f98d28fbd87c899262e4f5 (diff) | |
Merge branch 'master' into lukeshu/kernels
Also update linux-libre-grsec because I couldn't verify the checksum of the
now 6-hour obsolete patch.
Conflicts:
libre/linux-libre-grsec/PKGBUILD
libre/lirc-parabola/PKGBUILD
Diffstat (limited to 'libre/xbmc-libre/libnfs-header-changes.patch')
| -rw-r--r-- | libre/xbmc-libre/libnfs-header-changes.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libre/xbmc-libre/libnfs-header-changes.patch b/libre/xbmc-libre/libnfs-header-changes.patch deleted file mode 100644 index ef3d45e2c..000000000 --- a/libre/xbmc-libre/libnfs-header-changes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp -index 85084a5..8efa7bf 100644 ---- a/xbmc/filesystem/NFSDirectory.cpp -+++ b/xbmc/filesystem/NFSDirectory.cpp -@@ -37,6 +37,7 @@ - using namespace XFILE; - using namespace std; - #include <limits.h> -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - #include <nfsc/libnfs-raw-nfs.h> - -diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp -index 479f3fe..2aeea32 100644 ---- a/xbmc/filesystem/NFSFile.cpp -+++ b/xbmc/filesystem/NFSFile.cpp -@@ -32,6 +32,7 @@ - #include "network/DNSNameCache.h" - #include "threads/SystemClock.h" - -+#include <nfsc/libnfs-zdr.h> - #include <nfsc/libnfs-raw-mount.h> - - #ifdef TARGET_WINDOWS |