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

Closes #11239
2025-11-04 09:44:31 +00:00 · 2021-09-08 22:25:19 +02:00
parent 69f4438d35
commit fbe88ef8f5
17 changed files with 3 additions and 3 deletions
--- 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
--- a/src/nvim/xdiff/COPYING
+++ b/src/nvim/xdiff/COPYING
--- a/src/nvim/xdiff/README.txt
+++ b/src/nvim/xdiff/README.txt
--- a/src/nvim/xdiff/xdiff.h
+++ b/src/nvim/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)
--- a/src/nvim/xdiff/xdiffi.c
+++ b/src/nvim/xdiff/xdiffi.c
--- a/src/nvim/xdiff/xdiffi.h
+++ b/src/nvim/xdiff/xdiffi.h
--- a/src/nvim/xdiff/xemit.c
+++ b/src/nvim/xdiff/xemit.c
--- a/src/nvim/xdiff/xemit.h
+++ b/src/nvim/xdiff/xemit.h
--- a/src/nvim/xdiff/xhistogram.c
+++ b/src/nvim/xdiff/xhistogram.c
--- a/src/nvim/xdiff/xinclude.h
+++ b/src/nvim/xdiff/xinclude.h
--- a/src/nvim/xdiff/xmacros.h
+++ b/src/nvim/xdiff/xmacros.h
--- a/src/nvim/xdiff/xpatience.c
+++ b/src/nvim/xdiff/xpatience.c
--- a/src/nvim/xdiff/xprepare.c
+++ b/src/nvim/xdiff/xprepare.c
--- a/src/nvim/xdiff/xprepare.h
+++ b/src/nvim/xdiff/xprepare.h
--- a/src/nvim/xdiff/xtypes.h
+++ b/src/nvim/xdiff/xtypes.h
--- a/src/nvim/xdiff/xutils.c
+++ b/src/nvim/xdiff/xutils.c
--- a/src/nvim/xdiff/xutils.h
+++ b/src/nvim/xdiff/xutils.h