patch 7.4.1202

Problem:    Still one more file still using __ARGS.
Solution:   Remove __ARGS in the last file. (script by Hirohito Higashi)
            (closes #612)

diff --git a/src/Makefile b/src/Makefile
index 29c868057d2e8ca541b7e5d736d5a83b8d978de8..38d31eb340f1227f96f664487d0a824339123075 100644 (file)
--- 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 4f71d65547e44b692a2731d3ed7cdbdb2383c681..d14ce365d909ce5204e9d06056b6c5d218fcf235 100644 (file)
--- 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 e9417889afd107ceb7b249b9f5ec7d54b100a4c8..e86e40870bc79ab22f0b61f5eee9076729c5692e 100644 (file)
--- 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 5532bf398e8b5b7bbb1a0bf7086958ac266b28cf..cd614341edb593c44fad97aaa1d37eec03521cc3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1202,
 /**/
     1201,
 /**/