Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 2 insertions, 5 deletions

diff --git a/src/nvim/syntax_defs.h b/src/nvim/syntax_defs.h
index 3f3101f7e3..ae4997154e 100644
--- a/src/nvim/syntax_defs.h
+++ b/src/nvim/syntax_defs.h
@@ -1,5 +1,4 @@
-#ifndef NVIM_SYNTAX_DEFS_H
-#define NVIM_SYNTAX_DEFS_H
+#pragma once
 
 #include "nvim/highlight_defs.h"
 
@@ -30,7 +29,7 @@ struct keyentry {
   int16_t *next_list;           // ID list for next match (if non-zero)
   int flags;
   int k_char;                   // conceal substitute character
-  char keyword[1];              // actually longer
+  char keyword[];
 };
 
 // Struct used to store one state of the state stack.
@@ -59,5 +58,3 @@ struct syn_state {
   linenr_T sst_change_lnum;     // when non-zero, change in this line
                                 // may have made the state invalid
 };
-
-#endif  // NVIM_SYNTAX_DEFS_H