From c278c4dbcd0fc89f7baee4c82676e9deef780528 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 20 May 2024 10:26:12 -0400
Subject: Fix bad confict resolution

* Repairs linux build
---
 src/copy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/copy.c')

diff --git a/src/copy.c b/src/copy.c
index de87446..d7b13b6 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -182,7 +182,7 @@ int copytree(const char *srcdir, const char *destdir, unsigned int op) {
 #if defined (OMC_OS_WINDOWS)
         is_dir = S_ISDIR(st.st_mode);
 #else
-        is_dir = DT_DIR == rec->d_type;
+        is_dir = DT_DIR == d->d_type;
 #endif
         if (is_dir) {
             if (strncmp(src, dest, strlen(src)) == 0) {
-- 
cgit