diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-29 23:46:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-29 23:46:21 +0100 |
| commit | 3e96c3d241ab657cf4df0913ea8de50a6cb90730 (patch) | |
| tree | a80c7a34ae529aac456dbc43a65db62e39398ed1 /src | |
| parent | 569850724ef37061bfd4cb6423f04c8b8c690515 (diff) | |
patch 7.4.1202v7.4.1202
Problem: Still one more file still using __ARGS.
Solution: Remove __ARGS in the last file. (script by Hirohito Higashi)
(closes #612)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/os_mac_conv.c | 3 | ||||
| -rw-r--r-- | src/proto/os_mac_conv.pro | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/src/Makefile b/src/Makefile index 29c868057d..38d31eb340 100644 --- 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 \ diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c index 4f71d65547..d14ce365d9 100644 --- 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 diff --git a/src/proto/os_mac_conv.pro b/src/proto/os_mac_conv.pro index e9417889af..e86e40870b 100644 --- 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 : */ diff --git a/src/version.c b/src/version.c index 5532bf398e..cd614341ed 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1202, +/**/ 1201, /**/ 1200, |