aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2019-11-16 13:50:52 +0900
committerBjörn Linse <bjorn.linse@gmail.com>2020-01-17 11:36:28 +0100
commit8f91d709b0006e3fcfa4cb59abd9b77938096d76 (patch)
treec9773ba248ca269bad73dc02f62ee2e92b2fe4d4
parent2c8016c7048051da9afd809b580cf8f2d2c69614 (diff)
downloadrneovim-8f91d709b0006e3fcfa4cb59abd9b77938096d76.tar.gz
rneovim-8f91d709b0006e3fcfa4cb59abd9b77938096d76.tar.bz2
rneovim-8f91d709b0006e3fcfa4cb59abd9b77938096d76.zip
Rename from os_win_conpty.{c,h} to pty_conpty_win.{c,h}
-rw-r--r--src/nvim/CMakeLists.txt4
-rw-r--r--src/nvim/channel.c2
-rw-r--r--src/nvim/option.c2
-rw-r--r--src/nvim/os/pty_conpty_win.c (renamed from src/nvim/os/os_win_conpty.c)2
-rw-r--r--src/nvim/os/pty_conpty_win.h (renamed from src/nvim/os/os_win_conpty.h)8
-rw-r--r--src/nvim/os/pty_process_win.c2
-rw-r--r--src/nvim/os/pty_process_win.h2
7 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 62d45ff4a3..089dd537e9 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -134,7 +134,7 @@ foreach(sfile ${NVIM_SOURCES})
if(NOT WIN32 AND ${f} MATCHES "^(pty_process_win.c)$")
list(APPEND to_remove ${sfile})
endif()
- if(NOT WIN32 AND ${f} MATCHES "^(os_win_conpty.c)$")
+ if(NOT WIN32 AND ${f} MATCHES "^(pty_conpty_win.c)$")
list(APPEND to_remove ${sfile})
endif()
if(NOT WIN32 AND ${f} MATCHES "^(os_win_console.c)$")
@@ -643,7 +643,7 @@ endfunction()
set(NO_SINGLE_CHECK_HEADERS
os/win_defs.h
os/pty_process_win.h
- os/os_win_conpty.h
+ os/pty_conpty_win.h
os/os_win_console.h
)
foreach(hfile ${NVIM_HEADERS})
diff --git a/src/nvim/channel.c b/src/nvim/channel.c
index b346845c66..d3e2977eae 100644
--- a/src/nvim/channel.c
+++ b/src/nvim/channel.c
@@ -12,7 +12,7 @@
#include "nvim/msgpack_rpc/server.h"
#include "nvim/os/shell.h"
#ifdef WIN32
-# include "nvim/os/os_win_conpty.h"
+# include "nvim/os/pty_conpty_win.h"
# include "nvim/os/os_win_console.h"
#endif
#include "nvim/path.h"
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 591c8234c3..014eb676a0 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -77,7 +77,7 @@
#include "nvim/window.h"
#include "nvim/os/os.h"
#ifdef WIN32
-# include "nvim/os/os_win_conpty.h"
+# include "nvim/os/pty_conpty_win.h"
#endif
#include "nvim/api/private/helpers.h"
#include "nvim/os/input.h"
diff --git a/src/nvim/os/os_win_conpty.c b/src/nvim/os/pty_conpty_win.c
index 3d5ba83523..5bcadd6490 100644
--- a/src/nvim/os/os_win_conpty.c
+++ b/src/nvim/os/pty_conpty_win.c
@@ -5,7 +5,7 @@
#include "nvim/vim.h"
#include "nvim/os/os.h"
-#include "nvim/os/os_win_conpty.h"
+#include "nvim/os/pty_conpty_win.h"
#ifndef EXTENDED_STARTUPINFO_PRESENT
# define EXTENDED_STARTUPINFO_PRESENT 0x00080000
diff --git a/src/nvim/os/os_win_conpty.h b/src/nvim/os/pty_conpty_win.h
index 8a5f45e2cd..c243db4fa5 100644
--- a/src/nvim/os/os_win_conpty.h
+++ b/src/nvim/os/pty_conpty_win.h
@@ -1,5 +1,5 @@
-#ifndef NVIM_OS_OS_WIN_CONPTY_H
-#define NVIM_OS_OS_WIN_CONPTY_H
+#ifndef NVIM_OS_PTY_CONPTY_WIN_H
+#define NVIM_OS_PTY_CONPTY_WIN_H
#ifndef HPCON
# define HPCON VOID *
@@ -16,7 +16,7 @@ typedef struct conpty {
} conpty_t;
#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "os/os_win_conpty.h.generated.h"
+# include "os/pty_conpty_win.h.generated.h"
#endif
-#endif // NVIM_OS_OS_WIN_CONPTY_H
+#endif // NVIM_OS_PTY_CONPTY_WIN_H
diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c
index 7108d9c049..64d4408ece 100644
--- a/src/nvim/os/pty_process_win.c
+++ b/src/nvim/os/pty_process_win.c
@@ -12,7 +12,7 @@
#include "nvim/memory.h"
#include "nvim/mbyte.h" // for utf8_to_utf16, utf16_to_utf8
#include "nvim/os/pty_process_win.h"
-#include "nvim/os/os_win_conpty.h"
+#include "nvim/os/pty_conpty_win.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "os/pty_process_win.c.generated.h"
diff --git a/src/nvim/os/pty_process_win.h b/src/nvim/os/pty_process_win.h
index 04c8439c6c..8ad5ba7286 100644
--- a/src/nvim/os/pty_process_win.h
+++ b/src/nvim/os/pty_process_win.h
@@ -6,7 +6,7 @@
#include "nvim/event/process.h"
#include "nvim/lib/queue.h"
-#include "nvim/os/os_win_conpty.h"
+#include "nvim/os/pty_conpty_win.h"
typedef enum {
kWinpty,