Commit 5f795225 authored by Eliseo Martínez's avatar Eliseo Martínez

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.
parent 71c79b5b
......@@ -1038,7 +1038,7 @@ def GetHeaderGuardCPPVariable(filename):
fileinfo = FileInfo(filename)
file_path_from_root = fileinfo.RelativePath()
return 'NEOVIM_' + re.sub(r'[-./\s]', '_', file_path_from_root).upper()
return 'NVIM_' + re.sub(r'[-./\s]', '_', file_path_from_root).upper()
def CheckForHeaderGuard(filename, lines, error):
......
#ifndef NEOVIM_API_BUFFER_H
#define NEOVIM_API_BUFFER_H
#ifndef NVIM_API_BUFFER_H
#define NVIM_API_BUFFER_H
#include <stdint.h>
#include <stdbool.h>
......@@ -141,5 +141,5 @@ void buffer_insert(Buffer buffer, int64_t index, StringArray lines, Error *err);
/// @return The (row, col) tuple
Position buffer_get_mark(Buffer buffer, String name, Error *err);
#endif // NEOVIM_API_BUFFER_H
#endif // NVIM_API_BUFFER_H
#ifndef NEOVIM_API_DEFS_H
#define NEOVIM_API_DEFS_H
#ifndef NVIM_API_DEFS_H
#define NVIM_API_DEFS_H
#include <stdint.h>
#include <string.h>
......@@ -70,5 +70,5 @@ struct key_value_pair {
};
#endif // NEOVIM_API_DEFS_H
#endif // NVIM_API_DEFS_H
#ifndef NEOVIM_API_HELPERS_H
#define NEOVIM_API_HELPERS_H
#ifndef NVIM_API_HELPERS_H
#define NVIM_API_HELPERS_H
#include <stdbool.h>
......@@ -86,5 +86,5 @@ win_T * find_window(Window window, Error *err);
/// @return the tabpage pointer
tabpage_T * find_tab(Tabpage tabpage, Error *err);
#endif // NEOVIM_API_HELPERS_H
#endif // NVIM_API_HELPERS_H
#ifndef NEOVIM_API_TABPAGE_H
#define NEOVIM_API_TABPAGE_H
#ifndef NVIM_API_TABPAGE_H
#define NVIM_API_TABPAGE_H
#include <stdint.h>
#include <stdbool.h>
......@@ -43,5 +43,5 @@ Window tabpage_get_window(Tabpage tabpage, Error *err);
/// @return true if the tab page is valid, false otherwise
bool tabpage_is_valid(Tabpage tabpage);
#endif // NEOVIM_API_TABPAGE_H
#endif // NVIM_API_TABPAGE_H
#ifndef NEOVIM_API_VIM_H
#define NEOVIM_API_VIM_H
#ifndef NVIM_API_VIM_H
#define NVIM_API_VIM_H
#include <stdint.h>
#include <stdbool.h>
......@@ -154,5 +154,5 @@ Tabpage vim_get_current_tabpage(void);
/// @param[out] err Details of an error that may have occurred
void vim_set_current_tabpage(Tabpage tabpage, Error *err);
#endif // NEOVIM_API_VIM_H
#endif // NVIM_API_VIM_H
#ifndef NEOVIM_API_WINDOW_H
#define NEOVIM_API_WINDOW_H
#ifndef NVIM_API_WINDOW_H
#define NVIM_API_WINDOW_H
#include <stdint.h>
#include <stdbool.h>
......@@ -111,5 +111,5 @@ Tabpage window_get_tabpage(Window window, Error *err);
/// @return true if the window is valid, false otherwise
bool window_is_valid(Window window);
#endif // NEOVIM_API_WINDOW_H
#endif // NVIM_API_WINDOW_H
#ifndef NEOVIM_ARABIC_H
#define NEOVIM_ARABIC_H
#ifndef NVIM_ARABIC_H
#define NVIM_ARABIC_H
/// Whether c belongs to the range of Arabic characters that might be shaped.
static inline int arabic_char(int c)
......@@ -13,4 +13,4 @@ int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1,
int arabic_combine(int one, int two);
int arabic_maycombine(int two);
#endif // NEOVIM_ARABIC_H
#endif // NVIM_ARABIC_H
......@@ -5,8 +5,8 @@
* Do ":help credits" in Vim to see a list of people who contributed.
*/
#ifndef NEOVIM_ASCII_H
#define NEOVIM_ASCII_H
#ifndef NVIM_ASCII_H
#define NVIM_ASCII_H
/*
* Definitions of various common control characters.
......@@ -94,4 +94,4 @@
# define PATHSEPSTR "/"
#endif
#endif /* NEOVIM_ASCII_H */
#endif /* NVIM_ASCII_H */
#ifndef NEOVIM_BLOWFISH_H
#define NEOVIM_BLOWFISH_H
#ifndef NVIM_BLOWFISH_H
#define NVIM_BLOWFISH_H
void bf_key_init(char_u *password, char_u *salt, int salt_len);
void bf_cfb_init(char_u *iv, int iv_len);
......@@ -10,4 +10,4 @@ void bf_crypt_save(void);
void bf_crypt_restore(void);
int blowfish_self_test(void);
#endif // NEOVIM_BLOWFISH_H
#endif // NVIM_BLOWFISH_H
#ifndef NEOVIM_BUFFER_H
#define NEOVIM_BUFFER_H
#ifndef NVIM_BUFFER_H
#define NVIM_BUFFER_H
/* buffer.c */
int open_buffer(int read_stdin, exarg_T *eap, int flags);
int buf_valid(buf_T *buf);
......@@ -78,4 +78,4 @@ void set_buflisted(int on);
int buf_contents_changed(buf_T *buf);
void wipe_buffer(buf_T *buf, int aucmd);
#endif /* NEOVIM_BUFFER_H */
#endif /* NVIM_BUFFER_H */
#ifndef NEOVIM_BUFFER_DEFS_H
#define NEOVIM_BUFFER_DEFS_H
#ifndef NVIM_BUFFER_DEFS_H
#define NVIM_BUFFER_DEFS_H
// for garray_T
#include "nvim/garray.h"
......@@ -1078,4 +1078,4 @@ struct window_S {
qf_info_T *w_llist_ref;
};
#endif // NEOVIM_BUFFER_DEFS_H
#endif // NVIM_BUFFER_DEFS_H
#ifndef NEOVIM_CHARSET_H
#define NEOVIM_CHARSET_H
#ifndef NVIM_CHARSET_H
#define NVIM_CHARSET_H
int init_chartab(void);
int buf_init_chartab(buf_T *buf, int global);
......@@ -63,4 +63,4 @@ int rem_backslash(char_u *str);
void backslash_halve(char_u *p);
char_u *backslash_halve_save(char_u *p);
#endif // NEOVIM_CHARSET_H
#endif // NVIM_CHARSET_H
#ifndef NEOVIM_CRYPT_H
#define NEOVIM_CRYPT_H
#ifndef NVIM_CRYPT_H
#define NVIM_CRYPT_H
/// Returns the crypt method string as a number.
///
......@@ -79,4 +79,4 @@ void free_crypt_key(char_u *key);
/// @return The crypt key. On failure, NULL is returned.
char_u *get_crypt_key(int store, int twice);
#endif // NEOVIM_CRYPT_H
#endif // NVIM_CRYPT_H
#ifndef NEOVIM_CURSOR_SHAPE_H
#define NEOVIM_CURSOR_SHAPE_H
#ifndef NVIM_CURSOR_SHAPE_H
#define NVIM_CURSOR_SHAPE_H
/*
* struct to store values from 'guicursor' and 'mouseshape'
......@@ -49,4 +49,4 @@ typedef struct cursor_entry {
char_u *parse_shape_opt(int what);
#endif /* NEOVIM_CURSOR_SHAPE_H */
#endif /* NVIM_CURSOR_SHAPE_H */
#ifndef NEOVIM_DIFF_H
#define NEOVIM_DIFF_H
#ifndef NVIM_DIFF_H
#define NVIM_DIFF_H
void diff_buf_delete(buf_T *buf);
void diff_buf_adjust(win_T *win);
......@@ -30,4 +30,4 @@ linenr_T diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1,
linenr_T lnum3);
linenr_T diff_lnum_win(linenr_T lnum, win_T *wp);
#endif // NEOVIM_DIFF_H
#endif // NVIM_DIFF_H
#ifndef NEOVIM_DIGRAPH_H
#define NEOVIM_DIGRAPH_H
#ifndef NVIM_DIGRAPH_H
#define NVIM_DIGRAPH_H
int do_digraph(int c);
int get_digraph(int cmdline);
......@@ -9,4 +9,4 @@ void listdigraphs(void);
char_u *keymap_init(void);
void ex_loadkeymap(exarg_T *eap);
#endif // NEOVIM_DIGRAPH_H
#endif // NVIM_DIGRAPH_H
#ifndef NEOVIM_EDIT_H
#define NEOVIM_EDIT_H
#ifndef NVIM_EDIT_H
#define NVIM_EDIT_H
#include "nvim/vim.h"
......@@ -55,4 +55,4 @@ int in_cinkeys(int keytyped, int when, int line_is_empty);
int hkmap(int c);
int ins_copychar(linenr_T lnum);
#endif /* NEOVIM_EDIT_H */
#endif /* NVIM_EDIT_H */
#ifndef NEOVIM_EVAL_H
#define NEOVIM_EVAL_H
#ifndef NVIM_EVAL_H
#define NVIM_EVAL_H
/* eval.c */
void eval_init(void);
void eval_clear(void);
......@@ -149,4 +149,4 @@ int modify_fname(char_u *src, int *usedlen, char_u **fnamep,
char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub,
char_u *flags);
#endif /* NEOVIM_EVAL_H */
#endif /* NVIM_EVAL_H */
#ifndef NEOVIM_EVAL_DEFS_H
#define NEOVIM_EVAL_DEFS_H
#ifndef NVIM_EVAL_DEFS_H
#define NVIM_EVAL_DEFS_H
#include "nvim/hashtab.h"
......@@ -113,4 +113,4 @@ struct dictvar_S {
dict_T *dv_used_prev; /* previous dict in used dicts list */
};
#endif // NEOVIM_EVAL_DEFS_H
#endif // NVIM_EVAL_DEFS_H
#ifndef NEOVIM_EX_CMDS_H
#define NEOVIM_EX_CMDS_H
#ifndef NVIM_EX_CMDS_H
#define NVIM_EX_CMDS_H
/* ex_cmds.c */
void do_ascii(exarg_T *eap);
......@@ -72,4 +72,4 @@ char_u *get_sign_name(expand_T *xp, int idx);
void set_context_in_sign_cmd(expand_T *xp, char_u *arg);
void ex_drop(exarg_T *eap);
#endif /* NEOVIM_EX_CMDS_H */
#endif /* NVIM_EX_CMDS_H */
#ifndef NEOVIM_EX_CMDS2_H
#define NEOVIM_EX_CMDS2_H
#ifndef NVIM_EX_CMDS2_H
#define NVIM_EX_CMDS2_H
/* ex_cmds2.c */
void do_debug(char_u *cmd);
void ex_debug(exarg_T *eap);
......@@ -92,4 +92,4 @@ void free_locales(void);
char_u *get_lang_arg(expand_T *xp, int idx);
char_u *get_locales(expand_T *xp, int idx);
#endif /* NEOVIM_EX_CMDS2_H */
#endif /* NVIM_EX_CMDS2_H */
#ifndef NEOVIM_EX_DOCMD_H
#define NEOVIM_EX_DOCMD_H
#ifndef NVIM_EX_DOCMD_H
#define NVIM_EX_DOCMD_H
/* ex_docmd.c */
void do_exmode(int improved);
int do_cmdline_cmd(char_u *cmd);
......@@ -66,4 +66,4 @@ int put_line(FILE *fd, char *s);
void dialog_msg(char_u *buff, char *format, char_u *fname);
char_u *get_behave_arg(expand_T *xp, int idx);
#endif /* NEOVIM_EX_DOCMD_H */
#endif /* NVIM_EX_DOCMD_H */
#ifndef NEOVIM_EX_EVAL_H
#define NEOVIM_EX_EVAL_H
#ifndef NVIM_EX_EVAL_H
#define NVIM_EX_EVAL_H
/*
* A list used for saving values of "emsg_silent". Used by ex_try() to save the
......@@ -156,4 +156,4 @@ void rewind_conditionals(struct condstack *cstack, int idx,
void ex_endfunction(exarg_T *eap);
int has_loop_cmd(char_u *p);
#endif /* NEOVIM_EX_EVAL_H */
#endif /* NVIM_EX_EVAL_H */
#ifndef NEOVIM_EX_GETLN_H
#define NEOVIM_EX_GETLN_H
#ifndef NVIM_EX_GETLN_H
#define NVIM_EX_GETLN_H
/* ex_getln.c */
char_u *getcmdline(int firstc, long count, int indent);
char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr,
......@@ -63,4 +63,4 @@ void cmd_pchar(int c, int offset);
int cmd_gchar(int offset);
char_u *script_get(exarg_T *eap, char_u *cmd);
#endif /* NEOVIM_EX_GETLN_H */
#endif /* NVIM_EX_GETLN_H */
......@@ -8,8 +8,8 @@
/// TyD (for types that look like _X_ e.g. _AYN_)
/// TyE (for types that look like X e.g. RE)
#ifndef NEOVIM_FARSI_H
#define NEOVIM_FARSI_H
#ifndef NVIM_FARSI_H
#define NVIM_FARSI_H
#include "nvim/normal.h"
#include "nvim/types.h"
......@@ -180,4 +180,4 @@ int F_isdigit(int c);
int F_ischar(int c);
void farsi_fkey(cmdarg_T *cap);
#endif // NEOVIM_FARSI_H
#endif // NVIM_FARSI_H
#ifndef NEOVIM_FILE_SEARCH_H
#define NEOVIM_FILE_SEARCH_H
#ifndef NVIM_FILE_SEARCH_H
#define NVIM_FILE_SEARCH_H
void *vim_findfile_init(char_u *path, char_u *filename, char_u *
stopdirs, int level, int free_visited,
......@@ -20,4 +20,4 @@ char_u *find_file_in_path_option(char_u *ptr, int len, int options,
int find_what, char_u *rel_fname,
char_u *suffixes);
#endif /* NEOVIM_FILE_SEARCH_H */
#endif /* NVIM_FILE_SEARCH_H */
#ifndef NEOVIM_FILEIO_H
#define NEOVIM_FILEIO_H
#ifndef NVIM_FILEIO_H
#define NVIM_FILEIO_H
#include "nvim/buffer_defs.h"
#include "nvim/os/os.h"
......@@ -91,4 +91,4 @@ char_u *file_pat_to_reg_pat(char_u *pat, char_u *pat_end,
long read_eintr(int fd, void *buf, size_t bufsize);
long write_eintr(int fd, void *buf, size_t bufsize);
#endif /* NEOVIM_FILEIO_H */
#endif /* NVIM_FILEIO_H */
#ifndef NEOVIM_FOLD_H
#define NEOVIM_FOLD_H
#ifndef NVIM_FOLD_H
#define NVIM_FOLD_H
/*
* Info used to pass info about a fold from the fold-detection code to the
......@@ -62,4 +62,4 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume,
void foldtext_cleanup(char_u *str);
int put_folds(FILE *fd, win_T *wp);
#endif /* NEOVIM_FOLD_H */
#endif /* NVIM_FOLD_H */
#ifndef NEOVIM_FUNC_ATTR_H
#define NEOVIM_FUNC_ATTR_H
#ifndef NVIM_FUNC_ATTR_H
#define NVIM_FUNC_ATTR_H
// gcc and clang expose their version as follows:
//
......@@ -107,4 +107,4 @@
#define FUNC_ATTR_NONNULL_RET
#endif
#endif // NEOVIM_FUNC_ATTR_H
#endif // NVIM_FUNC_ATTR_H
#ifndef NEOVIM_GARRAY_H
#define NEOVIM_GARRAY_H
#ifndef NVIM_GARRAY_H
#define NVIM_GARRAY_H
#include "nvim/func_attr.h"
......@@ -28,4 +28,4 @@ void ga_concat(garray_T *gap, const char_u *restrict s);
void ga_append(garray_T *gap, char c);
void append_ga_line(garray_T *gap);
#endif // NEOVIM_GARRAY_H
#endif // NVIM_GARRAY_H
#ifndef NEOVIM_GETCHAR_H
#define NEOVIM_GETCHAR_H
#ifndef NVIM_GETCHAR_H
#define NVIM_GETCHAR_H
/* getchar.c */
void free_buff(buffheader_T *buf);
char_u *get_recorded(void);
......@@ -74,4 +74,4 @@ char_u *check_map(char_u *keys, int mode, int exact, int ign_mod,
int *local_ptr);
void add_map(char_u *map, int mode);
#endif /* NEOVIM_GETCHAR_H */
#endif /* NVIM_GETCHAR_H */
......@@ -5,8 +5,8 @@
* Do ":help credits" in Vim to see a list of people who contributed.
*/
#ifndef NEOVIM_GLOBALS_H
#define NEOVIM_GLOBALS_H
#ifndef NVIM_GLOBALS_H
#define NVIM_GLOBALS_H
#include <stdbool.h>
......@@ -1137,4 +1137,4 @@ EXTERN char *ignoredp;
* os_unix.c */
EXTERN int curr_tmode INIT(= TMODE_COOK); /* contains current terminal mode */
#endif /* NEOVIM_GLOBALS_H */
#endif /* NVIM_GLOBALS_H */
#ifndef NEOVIM_HARDCOPY_H
#define NEOVIM_HARDCOPY_H
#ifndef NVIM_HARDCOPY_H
#define NVIM_HARDCOPY_H
/*
* Structure to hold printing color and font attributes.
......@@ -90,4 +90,4 @@ void mch_print_set_font(int iBold, int iItalic, int iUnderline);
void mch_print_set_bg(long_u bgcol);
void mch_print_set_fg(long_u fgcol);
#endif /* NEOVIM_HARDCOPY_H */
#endif /* NVIM_HARDCOPY_H */
#ifndef NEOVIM_HASHTAB_H
#define NEOVIM_HASHTAB_H
#ifndef NVIM_HASHTAB_H
#define NVIM_HASHTAB_H
/* Item for a hashtable. "hi_key" can be one of three values:
* NULL: Never been used
......@@ -53,4 +53,4 @@ void hash_lock(hashtab_T *ht);
void hash_unlock(hashtab_T *ht);
hash_T hash_hash(char_u *key);
#endif /* NEOVIM_HASHTAB_H */
#endif /* NVIM_HASHTAB_H */
#ifndef NEOVIM_IF_CSCOPE_H
#define NEOVIM_IF_CSCOPE_H
#ifndef NVIM_IF_CSCOPE_H
#define NVIM_IF_CSCOPE_H
/* if_cscope.c */
char_u *get_cscope_name(expand_T *xp, int idx);
void set_context_in_cscope_cmd(expand_T *xp, char_u *arg,
......@@ -13,4 +13,4 @@ void cs_print_tags(void);
int cs_connection(int num, char_u *dbpath, char_u *ppath);
void cs_end(void);
#endif /* NEOVIM_IF_CSCOPE_H */
#endif /* NVIM_IF_CSCOPE_H */
#ifndef NEOVIM_IF_CSCOPE_DEFS_H
#define NEOVIM_IF_CSCOPE_DEFS_H
#ifndef NVIM_IF_CSCOPE_DEFS_H
#define NVIM_IF_CSCOPE_DEFS_H
/*
* CSCOPE support for Vim added by Andy Kahn <kahn@zk3.dec.com>
......@@ -68,4 +68,4 @@ typedef enum {
Print
} mcmd_e;
#endif // NEOVIM_IF_CSCOPE_DEFS_H
#endif // NVIM_IF_CSCOPE_DEFS_H
#ifndef NEOVIM_INDENT_H
#define NEOVIM_INDENT_H
#ifndef NVIM_INDENT_H
#define NVIM_INDENT_H
#include "nvim/vim.h"
int get_indent(void);
int get_indent_lnum(linenr_T lnum);
......@@ -11,4 +11,4 @@ int get_number_indent(linenr_T lnum);
int inindent(int extra);
int get_expr_indent(void);
int get_lisp_indent(void);
#endif // NEOVIM_INDENT_H
#endif // NVIM_INDENT_H
#ifndef NEOVIM_INDENT_C_H
#define NEOVIM_INDENT_C_H
#ifndef NVIM_INDENT_C_H
#define NVIM_INDENT_C_H
#include "nvim/vim.h"
int cin_islabel(void);
int cin_iscase(char_u *s, int strict);
......
......@@ -5,8 +5,8 @@
* Do ":help credits" in Vim to see a list of people who contributed.
*/
#ifndef NEOVIM_KEYMAP_H
#define NEOVIM_KEYMAP_H
#ifndef NVIM_KEYMAP_H
#define NVIM_KEYMAP_H
/*
* Keycode definitions for special keys.
......@@ -512,4 +512,4 @@ char_u *get_key_name(int i);
int get_mouse_button(int code, int *is_click, int *is_drag);
int get_pseudo_mouse_code(int button, int is_click, int is_drag);
#endif /* NEOVIM_KEYMAP_H */
#endif /* NVIM_KEYMAP_H */
#ifndef NEOVIM_LOG_H
#define NEOVIM_LOG_H
#ifndef NVIM_LOG_H
#define NVIM_LOG_H
#include <stdbool.h>
......@@ -53,5 +53,5 @@ bool do_log(int log_level, const char *func_name, int line_num,
#endif
#endif // NEOVIM_LOG_H
#endif // NVIM_LOG_H
#ifndef NEOVIM_MACROS_H
#define NEOVIM_MACROS_H
#ifndef NVIM_MACROS_H
#define NVIM_MACROS_H
/*
* VIM - Vi IMproved by Bram Moolenaar
......@@ -148,4 +148,4 @@
# define RESET_BINDING(wp) (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE
#endif // NEOVIM_MACROS_H
#endif // NVIM_MACROS_H
#ifndef NEOVIM_MAIN_H
#define NEOVIM_MAIN_H
#ifndef NVIM_MAIN_H
#define NVIM_MAIN_H
#include "nvim/normal.h"
......@@ -13,4 +13,4 @@ void time_msg(char *mesg, void *tv_start);
char_u *eval_client_expr_to_string(char_u *expr);
char_u *serverConvert(char_u *client_enc, char_u *data, char_u **tofree);
#endif /* NEOVIM_MAIN_H */
#endif /* NVIM_MAIN_H */
// General-purpose string->pointer associative array with a simple API
#ifndef NEOVIM_MAP_H
#define NEOVIM_MAP_H
#ifndef NVIM_MAP_H
#define NVIM_MAP_H
#include <stdbool.h>
......@@ -53,5 +53,5 @@ void *map_del(Map *map, const char *key);
/// @param cb A function that will be called for each key/value
void map_foreach(Map *map, key_value_cb cb);
#endif /* NEOVIM_MAP_H */
#endif /* NVIM_MAP_H */
#ifndef NEOVIM_MAP_DEFS_H
#define NEOVIM_MAP_DEFS_H
#ifndef NVIM_MAP_DEFS_H
#define NVIM_MAP_DEFS_H
typedef struct map Map;
......@@ -10,5 +10,5 @@ typedef struct map Map;
/// @param value A value
typedef void (*key_value_cb)(Map *map, const char *key, void *value);
#endif /* NEOVIM_MAP_DEFS_H */
#endif /* NVIM_MAP_DEFS_H */
#ifndef NEOVIM_MARK_H
#define NEOVIM_MARK_H
#ifndef NVIM_MARK_H
#define NVIM_MARK_H
#include "nvim/buffer_defs.h"
#include "nvim/mark_defs.h"
......@@ -39,4 +39,4 @@ int write_viminfo_marks(FILE *fp_out);
void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof,
int flags);
#endif /* NEOVIM_MARK_H */
#endif /* NVIM_MARK_H */
#ifndef NEOVIM_MARK_DEFS_H
#define NEOVIM_MARK_DEFS_H
#ifndef NVIM_MARK_DEFS_H
#define NVIM_MARK_DEFS_H
#include "nvim/pos.h"
......@@ -26,4 +26,4 @@ typedef struct xfilemark {
char_u *fname; /* file name, used when fnum == 0 */
} xfmark_T;
#endif // NEOVIM_MARK_DEFS_H
#endif // NVIM_MARK_DEFS_H
#ifndef NEOVIM_MBYTE_H
#define NEOVIM_MBYTE_H
#ifndef NVIM_MBYTE_H
#define NVIM_MBYTE_H
/* mbyte.c */
int enc_canon_props(char_u *name);
char_u *mb_init(void);
......@@ -84,4 +84,4 @@ char_u *string_convert(vimconv_T *vcp, char_u *ptr, int *lenp);
char_u *string_convert_ext(vimconv_T *vcp, char_u *ptr, int *lenp,
int *unconvlenp);
#endif /* NEOVIM_MBYTE_H */
#endif /* NVIM_MBYTE_H */
#ifndef NEOVIM_MEMFILE_H
#define NEOVIM_MEMFILE_H
#ifndef NVIM_MEMFILE_H
#define NVIM_MEMFILE_H
#include "nvim/buffer_defs.h"
#include "nvim/memfile_defs.h"
......@@ -22,4 +22,4 @@ void mf_set_ffname(memfile_T *mfp);
void mf_fullname(memfile_T *mfp);
int mf_need_trans(memfile_T *mfp);
#endif /* NEOVIM_MEMFILE_H */
#endif /* NVIM_MEMFILE_H */
#ifndef NEOVIM_MEMFILE_DEFS_H
#define NEOVIM_MEMFILE_DEFS_H
#ifndef NVIM_MEMFILE_DEFS_H
#define NVIM_MEMFILE_DEFS_H
typedef struct block_hdr bhdr_T;
typedef long blocknr_T;
......@@ -104,4 +104,4 @@ struct memfile {
char_u mf_old_seed[MF_SEED_LEN];
};
#endif // NEOVIM_MEMFILE_DEFS_H
#endif // NVIM_MEMFILE_DEFS_H
#ifndef NEOVIM_MEMLINE_H
#define NEOVIM_MEMLINE_H
#ifndef NVIM_MEMLINE_H
#define NVIM_MEMLINE_H
#include "nvim/types.h"
#include "nvim/func_attr.h"
......@@ -44,4 +44,4 @@ void ml_decrypt_data(memfile_T *mfp, char_u *data, off_t offset,
long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp);
void goto_byte(long cnt);
#endif /* NEOVIM_MEMLINE_H */
#endif /* NVIM_MEMLINE_H */
#ifndef NEOVIM_MEMLINE_DEFS_H
#define NEOVIM_MEMLINE_DEFS_H
#ifndef NVIM_MEMLINE_DEFS_H
#define NVIM_MEMLINE_DEFS_H
#include "nvim/memfile_defs.h"
......@@ -56,4 +56,4 @@ typedef struct memline {
int ml_usedchunks;
} memline_T;
#endif // NEOVIM_MEMLINE_DEFS_H
#endif // NVIM_MEMLINE_DEFS_H
#ifndef NEOVIM_MEMORY_H
#define NEOVIM_MEMORY_H
#ifndef NVIM_MEMORY_H
#define NVIM_MEMORY_H
#include "nvim/func_attr.h"
#include "nvim/types.h"
......