diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 21:52:58 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 21:52:58 +0000 |
| commit | 931bffbda3668ddc609fc1da8f9eb576b170aa52 (patch) | |
| tree | d8c1843a95da5ea0bb4acc09f7e37843d9995c86 /src/nvim/channel.h | |
| parent | 142d9041391780ac15b89886a54015fdc5c73995 (diff) | |
| parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
| download | rneovim-userreg.tar.gz rneovim-userreg.tar.bz2 rneovim-userreg.zip | |
Merge remote-tracking branch 'upstream/master' into userreguserreg
Diffstat (limited to 'src/nvim/channel.h')
| -rw-r--r-- | src/nvim/channel.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/nvim/channel.h b/src/nvim/channel.h index 5743eaead5..5c9d708ac2 100644 --- a/src/nvim/channel.h +++ b/src/nvim/channel.h @@ -1,26 +1,23 @@ -#ifndef NVIM_CHANNEL_H -#define NVIM_CHANNEL_H +#pragma once #include <stdbool.h> #include <stdint.h> #include <stdlib.h> -#include "nvim/eval/typval.h" #include "nvim/eval/typval_defs.h" #include "nvim/event/libuv_process.h" #include "nvim/event/multiqueue.h" #include "nvim/event/process.h" #include "nvim/event/socket.h" #include "nvim/event/stream.h" -#include "nvim/garray.h" -#include "nvim/macros.h" +#include "nvim/garray_defs.h" +#include "nvim/macros_defs.h" #include "nvim/main.h" -#include "nvim/map.h" #include "nvim/map_defs.h" #include "nvim/msgpack_rpc/channel_defs.h" #include "nvim/os/pty_process.h" #include "nvim/terminal.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" #define CHAN_STDIO 1 #define CHAN_STDERR 2 @@ -110,9 +107,9 @@ struct Channel { bool callback_scheduled; }; -EXTERN PMap(uint64_t) channels INIT(= MAP_INIT); +EXTERN PMap(uint64_t) channels INIT( = MAP_INIT); -EXTERN Callback on_print INIT(= CALLBACK_INIT); +EXTERN Callback on_print INIT( = CALLBACK_INIT); #ifdef INCLUDE_GENERATED_DECLARATIONS # include "channel.h.generated.h" @@ -121,7 +118,7 @@ EXTERN Callback on_print INIT(= CALLBACK_INIT); /// @returns Channel with the id or NULL if not found static inline Channel *find_channel(uint64_t id) { - return pmap_get(uint64_t)(&channels, id); + return (Channel *)pmap_get(uint64_t)(&channels, id); } static inline Stream *channel_instream(Channel *chan) @@ -163,5 +160,3 @@ static inline Stream *channel_outstream(Channel *chan) } abort(); } - -#endif // NVIM_CHANNEL_H |