diff options
author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2014-03-02 14:11:35 -0300 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-02 14:19:59 -0300 |
commit | d9283c4927cc5f926fa796acc2568610bd9a80d6 (patch) | |
tree | ee22db97987af38c538d1bd6501a384203579949 /src/globals.h | |
parent | 2bd6d444033b5746595713f4d037de135379a23e (diff) | |
download | rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.tar.gz rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.tar.bz2 rneovim-d9283c4927cc5f926fa796acc2568610bd9a80d6.zip |
Remove __ARGS macro. Close #205
This is a squash of all commits sent to #81.
- Remove unused undef of __ARGS.
- Fix mch_rename declaration.
- Follow changes related to moved & extracted files.
- Properly indent function declarations of getchar.h and quickfix.c.
Diffstat (limited to 'src/globals.h')
-rw-r--r-- | src/globals.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/globals.h b/src/globals.h index 056c098368..75011f7c53 100644 --- a/src/globals.h +++ b/src/globals.h @@ -645,28 +645,26 @@ EXTERN vimconv_T output_conv; /* type of output conversion */ * The value is set in mb_init(); */ /* length of char in bytes, including following composing chars */ -EXTERN int (*mb_ptr2len)__ARGS((char_u *p)) INIT(= latin_ptr2len); +EXTERN int (*mb_ptr2len)(char_u *p) INIT(= latin_ptr2len); /* idem, with limit on string length */ -EXTERN int (*mb_ptr2len_len)__ARGS((char_u *p, int size)) INIT( - = latin_ptr2len_len); +EXTERN int (*mb_ptr2len_len)(char_u *p, int size) INIT(= latin_ptr2len_len); /* byte length of char */ -EXTERN int (*mb_char2len)__ARGS((int c)) INIT(= latin_char2len); +EXTERN int (*mb_char2len)(int c) INIT(= latin_char2len); /* convert char to bytes, return the length */ -EXTERN int (*mb_char2bytes)__ARGS((int c, char_u *buf)) INIT(= latin_char2bytes); -EXTERN int (*mb_ptr2cells)__ARGS((char_u *p)) INIT(= latin_ptr2cells); -EXTERN int (*mb_ptr2cells_len)__ARGS((char_u *p, int size)) INIT( +EXTERN int (*mb_char2bytes)(int c, char_u *buf) INIT(= latin_char2bytes); +EXTERN int (*mb_ptr2cells)(char_u *p) INIT(= latin_ptr2cells); +EXTERN int (*mb_ptr2cells_len)(char_u *p, int size) INIT( = latin_ptr2cells_len); -EXTERN int (*mb_char2cells)__ARGS((int c)) INIT(= latin_char2cells); -EXTERN int (*mb_off2cells)__ARGS((unsigned off, unsigned max_off)) INIT( +EXTERN int (*mb_char2cells)(int c) INIT(= latin_char2cells); +EXTERN int (*mb_off2cells)(unsigned off, unsigned max_off) INIT( = latin_off2cells); -EXTERN int (*mb_ptr2char)__ARGS((char_u *p)) INIT(= latin_ptr2char); -EXTERN int (*mb_head_off)__ARGS((char_u *base, char_u *p)) INIT( - = latin_head_off); +EXTERN int (*mb_ptr2char)(char_u *p) INIT(= latin_ptr2char); +EXTERN int (*mb_head_off)(char_u *base, char_u *p) INIT(= latin_head_off); # if defined(USE_ICONV) && defined(DYNAMIC_ICONV) /* Pointers to functions and variables to be loaded at runtime */ EXTERN size_t (*iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); + char **outbuf, size_t *outbytesleft); EXTERN iconv_t (*iconv_open)(const char *tocode, const char *fromcode); EXTERN int (*iconv_close)(iconv_t cd); EXTERN int (*iconvctl)(iconv_t cd, int request, void *argument); |