diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
| commit | 21cb7d04c387e4198ca8098a884c78b56ffcf4c2 (patch) | |
| tree | 84fe5690df1551f0bb2bdfe1a13aacd29ebc1de7 /src/nvim/lib | |
| parent | d9c904f85a23a496df4eb6be42aa43f007b22d50 (diff) | |
| parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
| download | rneovim-colorcolchar.tar.gz rneovim-colorcolchar.tar.bz2 rneovim-colorcolchar.zip | |
Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar
Diffstat (limited to 'src/nvim/lib')
| -rw-r--r-- | src/nvim/lib/queue.h | 5 | ||||
| -rw-r--r-- | src/nvim/lib/ringbuf.h | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/nvim/lib/queue.h b/src/nvim/lib/queue.h index c6d3f74ec1..40769e44b5 100644 --- a/src/nvim/lib/queue.h +++ b/src/nvim/lib/queue.h @@ -17,8 +17,7 @@ // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#ifndef NVIM_LIB_QUEUE_H -#define NVIM_LIB_QUEUE_H +#pragma once #include <stddef.h> @@ -91,5 +90,3 @@ static inline void QUEUE_REMOVE(QUEUE *const q) FUNC_ATTR_ALWAYS_INLINE q->prev->next = q->next; q->next->prev = q->prev; } - -#endif // NVIM_LIB_QUEUE_H diff --git a/src/nvim/lib/ringbuf.h b/src/nvim/lib/ringbuf.h index 907018a06e..c8abccfeb4 100644 --- a/src/nvim/lib/ringbuf.h +++ b/src/nvim/lib/ringbuf.h @@ -12,8 +12,8 @@ /// - idx_p: get pointer to the element at given index. /// - insert: insert element at given position. /// - remove: remove element from given position. -#ifndef NVIM_LIB_RINGBUF_H -#define NVIM_LIB_RINGBUF_H + +#pragma once #include <assert.h> #include <stddef.h> @@ -288,5 +288,3 @@ rb->first = _RINGBUF_NEXT(rb, rb->first); \ } \ } - -#endif // NVIM_LIB_RINGBUF_H |