Mercurial > vim
changeset 7811:7fda54504fee v7.4.1202
commit https://github.com/vim/vim/commit/3e96c3d241ab657cf4df0913ea8de50a6cb90730
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 29 23:46:21 2016 +0100
patch 7.4.1202
Problem: Still one more file still using __ARGS.
Solution: Remove __ARGS in the last file. (script by Hirohito Higashi)
(closes https://github.com/vim/vim/issues/612)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 30 Jan 2016 00:00:05 +0100 |
parents | 385d3477ab8e |
children | 5e9227816126 |
files | src/Makefile src/os_mac_conv.c src/proto/os_mac_conv.pro src/version.c |
diffstat | 4 files changed, 15 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -1679,6 +1679,7 @@ PRO_AUTO = \ normal.pro \ ops.pro \ option.pro \ + os_mac_conv.pro \ os_unix.pro \ popupmnu.pro \ pty.pro \
--- a/src/os_mac_conv.c +++ b/src/os_mac_conv.c @@ -17,7 +17,8 @@ #define BalloonEval int /* used in header files */ #include "vim.h" -#ifndef FEAT_GUI_MAC + +#if !defined(FEAT_GUI_MAC) && !defined(PROTO) # include <CoreServices/CoreServices.h> #endif
--- a/src/proto/os_mac_conv.pro +++ b/src/proto/os_mac_conv.pro @@ -1,12 +1,12 @@ /* os_mac_conv.c */ -char_u *mac_string_convert __ARGS((char_u *ptr, int len, int *lenp, int fail_on_error, int from_enc, int to_enc, int *unconvlenp)); -int macroman2enc __ARGS((char_u *ptr, long *sizep, long real_size)); -int enc2macroman __ARGS((char_u *from, size_t fromlen, char_u *to, int *tolenp, int maxtolen, char_u *rest, int *restlenp)); -void mac_conv_init __ARGS((void)); -void mac_conv_cleanup __ARGS((void)); -char_u *mac_utf16_to_enc __ARGS((unsigned short *from, size_t fromLen, size_t *actualLen)); -unsigned short *mac_enc_to_utf16 __ARGS((char_u *from, size_t fromLen, size_t *actualLen)); -void * mac_enc_to_cfstring __ARGS((char_u *from, size_t fromLen)); -char_u *mac_precompose_path __ARGS((char_u *decompPath, size_t decompLen, size_t *precompLen)); -void mac_lang_init __ARGS((void)); +char_u *mac_string_convert(char_u *ptr, int len, int *lenp, int fail_on_error, int from_enc, int to_enc, int *unconvlenp); +int macroman2enc(char_u *ptr, long *sizep, long real_size); +int enc2macroman(char_u *from, size_t fromlen, char_u *to, int *tolenp, int maxtolen, char_u *rest, int *restlenp); +void mac_conv_init(void); +void mac_conv_cleanup(void); +char_u *mac_utf16_to_enc(unsigned short *from, size_t fromLen, size_t *actualLen); +unsigned short *mac_enc_to_utf16(char_u *from, size_t fromLen, size_t *actualLen); +void *mac_enc_to_cfstring(char_u *from, size_t fromLen); +char_u *mac_precompose_path(char_u *decompPath, size_t decompLen, size_t *precompLen); +void mac_lang_init(void); /* vim: set ft=c : */