build: move src/nvim/xdiff to src/xdiff

Closes #11239

17 files changed, 3 insertions, 3 deletions

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 3b2207f80b..4a698052ee 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -87,8 +87,8 @@ file(MAKE_DIRECTORY ${LINT_SUPPRESSES_ROOT}/src)
 
 file(GLOB NVIM_SOURCES *.c)
 file(GLOB NVIM_HEADERS *.h)
-file(GLOB XDIFF_SOURCES xdiff/*.c)
-file(GLOB XDIFF_HEADERS xdiff/*.h)
+file(GLOB XDIFF_SOURCES ../xdiff/*.c)
+file(GLOB XDIFF_HEADERS ../xdiff/*.h)
 
 foreach(subdir
         os
diff --git a/src/nvim/xdiff/COPYING b/src/xdiff/COPYING
index f3f1b3b65e..f3f1b3b65e 100644
--- a/src/nvim/xdiff/COPYING
+++ b/src/xdiff/COPYING
diff --git a/src/nvim/xdiff/README.txt b/src/xdiff/README.txt
index 95b2242b87..95b2242b87 100644
--- a/src/nvim/xdiff/README.txt
+++ b/src/xdiff/README.txt
diff --git a/src/nvim/xdiff/xdiff.h b/src/xdiff/xdiff.h
index f3dac80d3f..49985a0e9a 100644
--- a/src/nvim/xdiff/xdiff.h
+++ b/src/xdiff/xdiff.h
@@ -119,7 +119,7 @@ typedef struct s_bdiffparam {
 	long bsize;
 } bdiffparam_t;
 
-#include "../memory.h"
+#include "../nvim/memory.h"
 
 #define xdl_malloc(x) xmalloc((x))
 #define xdl_free(ptr) xfree(ptr)
diff --git a/src/nvim/xdiff/xdiffi.c b/src/xdiff/xdiffi.c
index cfcbb5d982..cfcbb5d982 100644
--- a/src/nvim/xdiff/xdiffi.c
+++ b/src/xdiff/xdiffi.c
diff --git a/src/nvim/xdiff/xdiffi.h b/src/xdiff/xdiffi.h
index 8f1c7c8b04..8f1c7c8b04 100644
--- a/src/nvim/xdiff/xdiffi.h
+++ b/src/xdiff/xdiffi.h
diff --git a/src/nvim/xdiff/xemit.c b/src/xdiff/xemit.c
index a0078f928c..a0078f928c 100644
--- a/src/nvim/xdiff/xemit.c
+++ b/src/xdiff/xemit.c
diff --git a/src/nvim/xdiff/xemit.h b/src/xdiff/xemit.h
index 1b9887e670..1b9887e670 100644
--- a/src/nvim/xdiff/xemit.h
+++ b/src/xdiff/xemit.h
diff --git a/src/nvim/xdiff/xhistogram.c b/src/xdiff/xhistogram.c
index 8598a8550d..8598a8550d 100644
--- a/src/nvim/xdiff/xhistogram.c
+++ b/src/xdiff/xhistogram.c
diff --git a/src/nvim/xdiff/xinclude.h b/src/xdiff/xinclude.h
index a412404bfe..a412404bfe 100644
--- a/src/nvim/xdiff/xinclude.h
+++ b/src/xdiff/xinclude.h
diff --git a/src/nvim/xdiff/xmacros.h b/src/xdiff/xmacros.h
index 2809a28ca9..2809a28ca9 100644
--- a/src/nvim/xdiff/xmacros.h
+++ b/src/xdiff/xmacros.h
diff --git a/src/nvim/xdiff/xpatience.c b/src/xdiff/xpatience.c
index f78c897ad8..f78c897ad8 100644
--- a/src/nvim/xdiff/xpatience.c
+++ b/src/xdiff/xpatience.c
diff --git a/src/nvim/xdiff/xprepare.c b/src/xdiff/xprepare.c
index abeb8fb84e..abeb8fb84e 100644
--- a/src/nvim/xdiff/xprepare.c
+++ b/src/xdiff/xprepare.c
diff --git a/src/nvim/xdiff/xprepare.h b/src/xdiff/xprepare.h
index 947d9fc1bb..947d9fc1bb 100644
--- a/src/nvim/xdiff/xprepare.h
+++ b/src/xdiff/xprepare.h
diff --git a/src/nvim/xdiff/xtypes.h b/src/xdiff/xtypes.h
index 8442bd436e..8442bd436e 100644
--- a/src/nvim/xdiff/xtypes.h
+++ b/src/xdiff/xtypes.h
diff --git a/src/nvim/xdiff/xutils.c b/src/xdiff/xutils.c
index 5ef519155d..5ef519155d 100644
--- a/src/nvim/xdiff/xutils.c
+++ b/src/xdiff/xutils.c
diff --git a/src/nvim/xdiff/xutils.h b/src/xdiff/xutils.h
index fba7bae03c..fba7bae03c 100644
--- a/src/nvim/xdiff/xutils.h
+++ b/src/xdiff/xutils.h