Rename from os_win_conpty.{c,h} to pty_conpty_win.{c,h}

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})

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"

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"

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

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

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"

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,