Introduce nvim namespace: Fix define guards.

Change define guards from NEOVIM_XXX_H to NVIM_XXX_H:
- Change header files.
- Change clint correct guard name calculation.

19 files changed, 57 insertions, 57 deletions

diff --git a/src/nvim/os/channel.h b/src/nvim/os/channel.h
index 6dd0288279..4a3962575d 100644
--- a/src/nvim/os/channel.h
+++ b/src/nvim/os/channel.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_CHANNEL_H
-#define NEOVIM_OS_CHANNEL_H
+#ifndef NVIM_OS_CHANNEL_H
+#define NVIM_OS_CHANNEL_H
 
 #include <uv.h>
 
@@ -25,5 +25,5 @@ void channel_from_stream(uv_stream_t *stream, ChannelProtocol prot);
 /// @param prot The rpc protocol used
 void channel_from_job(char **argv, ChannelProtocol prot);
 
-#endif  // NEOVIM_OS_CHANNEL_H
+#endif  // NVIM_OS_CHANNEL_H
 
diff --git a/src/nvim/os/channel_defs.h b/src/nvim/os/channel_defs.h
index 27ba103fbe..9763e0f284 100644
--- a/src/nvim/os/channel_defs.h
+++ b/src/nvim/os/channel_defs.h
@@ -1,8 +1,8 @@
-#ifndef NEOVIM_OS_CHANNEL_DEFS_H
-#define NEOVIM_OS_CHANNEL_DEFS_H
+#ifndef NVIM_OS_CHANNEL_DEFS_H
+#define NVIM_OS_CHANNEL_DEFS_H
 
 typedef enum {
   kChannelProtocolMsgpack
 } ChannelProtocol;
 
-#endif  // NEOVIM_OS_CHANNEL_DEFS_H
+#endif  // NVIM_OS_CHANNEL_DEFS_H
diff --git a/src/nvim/os/event.h b/src/nvim/os/event.h
index 9f1c2e5449..345ddba27e 100644
--- a/src/nvim/os/event.h
+++ b/src/nvim/os/event.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_EVENT_H
-#define NEOVIM_OS_EVENT_H
+#ifndef NVIM_OS_EVENT_H
+#define NVIM_OS_EVENT_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -14,5 +14,5 @@ bool event_is_pending(void);
 void event_push(Event event);
 void event_process(void);
 
-#endif  // NEOVIM_OS_EVENT_H
+#endif  // NVIM_OS_EVENT_H
 
diff --git a/src/nvim/os/event_defs.h b/src/nvim/os/event_defs.h
index c5de8b9ece..983b70be97 100644
--- a/src/nvim/os/event_defs.h
+++ b/src/nvim/os/event_defs.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_EVENT_DEFS_H
-#define NEOVIM_OS_EVENT_DEFS_H
+#ifndef NVIM_OS_EVENT_DEFS_H
+#define NVIM_OS_EVENT_DEFS_H
 
 #include "nvim/os/job_defs.h"
 #include "nvim/os/rstream_defs.h"
@@ -22,4 +22,4 @@ typedef struct {
   } data;
 } Event;
 
-#endif  // NEOVIM_OS_EVENT_DEFS_H
+#endif  // NVIM_OS_EVENT_DEFS_H
diff --git a/src/nvim/os/input.h b/src/nvim/os/input.h
index 9ffd50fd3f..298df04578 100644
--- a/src/nvim/os/input.h
+++ b/src/nvim/os/input.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_INPUT_H
-#define NEOVIM_OS_INPUT_H
+#ifndef NVIM_OS_INPUT_H
+#define NVIM_OS_INPUT_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -19,5 +19,5 @@ void os_breakcheck(void);
 /// @return `true` if file descriptor refers to a terminal.
 bool os_isatty(int fd);
 
-#endif  // NEOVIM_OS_INPUT_H
+#endif  // NVIM_OS_INPUT_H
 
diff --git a/src/nvim/os/job.h b/src/nvim/os/job.h
index e73ecc1223..4ddbc75807 100644
--- a/src/nvim/os/job.h
+++ b/src/nvim/os/job.h
@@ -4,8 +4,8 @@
 // the job's std{in,out,err}. They are more like bash/zsh co-processes than the
 // usual shell background job. The name 'Job' was chosen because it applies to
 // the concept while being significantly shorter.
-#ifndef NEOVIM_OS_JOB_H
-#define NEOVIM_OS_JOB_H
+#ifndef NVIM_OS_JOB_H
+#define NVIM_OS_JOB_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -74,5 +74,5 @@ int job_id(Job *job);
 /// @return The job data
 void *job_data(Job *job);
 
-#endif  // NEOVIM_OS_JOB_H
+#endif  // NVIM_OS_JOB_H
 
diff --git a/src/nvim/os/job_defs.h b/src/nvim/os/job_defs.h
index 13bc2f3ab0..8e4dc0cd88 100644
--- a/src/nvim/os/job_defs.h
+++ b/src/nvim/os/job_defs.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_JOB_DEFS_H
-#define NEOVIM_OS_JOB_DEFS_H
+#ifndef NVIM_OS_JOB_DEFS_H
+#define NVIM_OS_JOB_DEFS_H
 
 #include "nvim/os/rstream_defs.h"
 
@@ -11,5 +11,5 @@ typedef struct job Job;
 /// @param data Some data associated with the job by the caller
 typedef void (*job_exit_cb)(Job *job, void *data);
 
-#endif  // NEOVIM_OS_JOB_DEFS_H
+#endif  // NVIM_OS_JOB_DEFS_H
 
diff --git a/src/nvim/os/msgpack_rpc.h b/src/nvim/os/msgpack_rpc.h
index 8c1c9bcd7b..af2334f6dc 100644
--- a/src/nvim/os/msgpack_rpc.h
+++ b/src/nvim/os/msgpack_rpc.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_MSGPACK_RPC_H
-#define NEOVIM_OS_MSGPACK_RPC_H
+#ifndef NVIM_OS_MSGPACK_RPC_H
+#define NVIM_OS_MSGPACK_RPC_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -103,5 +103,5 @@ void msgpack_rpc_free_array(Array value);
 void msgpack_rpc_free_dictionary(Dictionary value);
 
 
-#endif  // NEOVIM_OS_MSGPACK_RPC_H
+#endif  // NVIM_OS_MSGPACK_RPC_H
 
diff --git a/src/nvim/os/os.h b/src/nvim/os/os.h
index 7a1ecf4e34..fa040d29bd 100644
--- a/src/nvim/os/os.h
+++ b/src/nvim/os/os.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_OS_H
-#define NEOVIM_OS_OS_H
+#ifndef NVIM_OS_OS_H
+#define NVIM_OS_OS_H
 #include <uv.h>
 
 #include "nvim/vim.h"
@@ -143,4 +143,4 @@ bool os_get_file_info_fd(int file_descriptor, FileInfo *file_info);
 /// @return `true` if the two FileInfos represent the same file.
 bool os_file_info_id_equal(FileInfo *file_info_1, FileInfo *file_info_2);
 
-#endif  // NEOVIM_OS_OS_H
+#endif  // NVIM_OS_OS_H
diff --git a/src/nvim/os/rstream.h b/src/nvim/os/rstream.h
index ee0098204e..7a565099b7 100644
--- a/src/nvim/os/rstream.h
+++ b/src/nvim/os/rstream.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_RSTREAM_H
-#define NEOVIM_OS_RSTREAM_H
+#ifndef NVIM_OS_RSTREAM_H
+#define NVIM_OS_RSTREAM_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -78,5 +78,5 @@ size_t rstream_available(RStream *rstream);
 /// @param event Object containing data necessary to invoke the callback
 void rstream_read_event(Event event);
 
-#endif  // NEOVIM_OS_RSTREAM_H
+#endif  // NVIM_OS_RSTREAM_H
 
diff --git a/src/nvim/os/rstream_defs.h b/src/nvim/os/rstream_defs.h
index 3d1dbec34f..5c7183c4c3 100644
--- a/src/nvim/os/rstream_defs.h
+++ b/src/nvim/os/rstream_defs.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_RSTREAM_DEFS_H
-#define NEOVIM_OS_RSTREAM_DEFS_H
+#ifndef NVIM_OS_RSTREAM_DEFS_H
+#define NVIM_OS_RSTREAM_DEFS_H
 
 #include <stdbool.h>
 
@@ -12,5 +12,5 @@ typedef struct rstream RStream;
 /// @param eof If the stream reached EOF.
 typedef void (*rstream_cb)(RStream *rstream, void *data, bool eof);
 
-#endif  // NEOVIM_OS_RSTREAM_DEFS_H
+#endif  // NVIM_OS_RSTREAM_DEFS_H
 
diff --git a/src/nvim/os/server.h b/src/nvim/os/server.h
index 0a5e798e8b..541746eb5f 100644
--- a/src/nvim/os/server.h
+++ b/src/nvim/os/server.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_SERVER_H
-#define NEOVIM_OS_SERVER_H
+#ifndef NVIM_OS_SERVER_H
+#define NVIM_OS_SERVER_H
 
 #include "nvim/os/channel_defs.h"
 
@@ -26,5 +26,5 @@ void server_start(char *endpoint, ChannelProtocol prot);
 /// @param endpoint Address of the server.
 void server_stop(char *endpoint);
 
-#endif  // NEOVIM_OS_SERVER_H
+#endif  // NVIM_OS_SERVER_H
 
diff --git a/src/nvim/os/server_defs.h b/src/nvim/os/server_defs.h
index cbaefe3949..08cdf55428 100644
--- a/src/nvim/os/server_defs.h
+++ b/src/nvim/os/server_defs.h
@@ -1,7 +1,7 @@
-#ifndef NEOVIM_OS_SERVER_DEFS_H
-#define NEOVIM_OS_SERVER_DEFS_H
+#ifndef NVIM_OS_SERVER_DEFS_H
+#define NVIM_OS_SERVER_DEFS_H
 
 typedef struct server Server;
 
-#endif  // NEOVIM_OS_SERVER_DEFS_H
+#endif  // NVIM_OS_SERVER_DEFS_H
 
diff --git a/src/nvim/os/shell.h b/src/nvim/os/shell.h
index 9e64be35bf..226ef97579 100644
--- a/src/nvim/os/shell.h
+++ b/src/nvim/os/shell.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_SHELL_H
-#define NEOVIM_OS_SHELL_H
+#ifndef NVIM_OS_SHELL_H
+#define NVIM_OS_SHELL_H
 
 #include <stdbool.h>
 
@@ -41,5 +41,5 @@ void shell_free_argv(char **argv);
 /// @param extra_shell_arg Extra argument to be passed to the shell
 int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg);
 
-#endif  // NEOVIM_OS_SHELL_H
+#endif  // NVIM_OS_SHELL_H
 
diff --git a/src/nvim/os/signal.h b/src/nvim/os/signal.h
index 7f4c24c89b..6a0ad5e9ac 100644
--- a/src/nvim/os/signal.h
+++ b/src/nvim/os/signal.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_SIGNAL_H
-#define NEOVIM_OS_SIGNAL_H
+#ifndef NVIM_OS_SIGNAL_H
+#define NVIM_OS_SIGNAL_H
 
 #include "nvim/os/event_defs.h"
 
@@ -9,5 +9,5 @@ void signal_accept_deadly(void);
 void signal_reject_deadly(void);
 void signal_handle(Event event);
 
-#endif  // NEOVIM_OS_SIGNAL_H
+#endif  // NVIM_OS_SIGNAL_H
 
diff --git a/src/nvim/os/time.h b/src/nvim/os/time.h
index ef795d03be..02fd77551e 100644
--- a/src/nvim/os/time.h
+++ b/src/nvim/os/time.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_TIME_H
-#define NEOVIM_OS_TIME_H
+#ifndef NVIM_OS_TIME_H
+#define NVIM_OS_TIME_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -31,5 +31,5 @@ struct tm *os_localtime_r(const time_t *clock, struct tm *result);
 ///         argument) or NULL in case of error
 struct tm *os_get_localtime(struct tm *result);
 
-#endif  // NEOVIM_OS_TIME_H
+#endif  // NVIM_OS_TIME_H
 
diff --git a/src/nvim/os/uv_helpers.h b/src/nvim/os/uv_helpers.h
index eed2c55c3a..03fd64457f 100644
--- a/src/nvim/os/uv_helpers.h
+++ b/src/nvim/os/uv_helpers.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_UV_HELPERS_H
-#define NEOVIM_OS_UV_HELPERS_H
+#ifndef NVIM_OS_UV_HELPERS_H
+#define NVIM_OS_UV_HELPERS_H
 
 #include <uv.h>
 
@@ -43,5 +43,5 @@ Job *handle_get_job(uv_handle_t *handle);
 /// @param job the Job pointer
 void handle_set_job(uv_handle_t *handle, Job *job);
 
-#endif  // NEOVIM_OS_UV_HELPERS_H
+#endif  // NVIM_OS_UV_HELPERS_H
 
diff --git a/src/nvim/os/wstream.h b/src/nvim/os/wstream.h
index ab41991e87..a12d26fd5e 100644
--- a/src/nvim/os/wstream.h
+++ b/src/nvim/os/wstream.h
@@ -1,5 +1,5 @@
-#ifndef NEOVIM_OS_WSTREAM_H
-#define NEOVIM_OS_WSTREAM_H
+#ifndef NVIM_OS_WSTREAM_H
+#define NVIM_OS_WSTREAM_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -36,5 +36,5 @@ void wstream_set_stream(WStream *wstream, uv_stream_t *stream);
 /// @return true if the data was successfully queued, false otherwise.
 bool wstream_write(WStream *wstream, char *buffer, uint32_t length, bool free);
 
-#endif  // NEOVIM_OS_WSTREAM_H
+#endif  // NVIM_OS_WSTREAM_H
 
diff --git a/src/nvim/os/wstream_defs.h b/src/nvim/os/wstream_defs.h
index 59d57365fa..e044ecfd8e 100644
--- a/src/nvim/os/wstream_defs.h
+++ b/src/nvim/os/wstream_defs.h
@@ -1,7 +1,7 @@
-#ifndef NEOVIM_OS_WSTREAM_DEFS_H
-#define NEOVIM_OS_WSTREAM_DEFS_H
+#ifndef NVIM_OS_WSTREAM_DEFS_H
+#define NVIM_OS_WSTREAM_DEFS_H
 
 typedef struct wstream WStream;
 
-#endif  // NEOVIM_OS_WSTREAM_DEFS_H
+#endif  // NVIM_OS_WSTREAM_DEFS_H