diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-06-24 14:41:19 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-06-24 14:41:19 +0000 |
commit | fab578f6052390e2e3e1884378740c9e4fc87830 (patch) | |
tree | 1fcf509dcec4dde465f3701ae9a8b59ac90a066b /src | |
parent | 782027ee289dfd55eb22c1ae8e6ff3645be90c3a (diff) | |
download | vim-fab578f6052390e2e3e1884378740c9e4fc87830.zip |
updated for version 7.2-212
Diffstat (limited to 'src')
-rw-r--r-- | src/os_mac.h | 12 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/os_mac.h b/src/os_mac.h index 7a54ee5c5..aadaed776 100644 --- a/src/os_mac.h +++ b/src/os_mac.h @@ -268,9 +268,15 @@ */ #ifdef MACOS_X_UNIX -# define SIGPROTOARG (int) -# define SIGDEFARG(s) (s) int s; -# define SIGDUMMYARG 0 +# ifndef SIGPROTOARG +# define SIGPROTOARG (int) +# endif +# ifndef SIGDEFARG +# define SIGDEFARG(s) (s) int s UNUSED; +# endif +# ifndef SIGDUMMYARG +# define SIGDUMMYARG 0 +# endif # undef HAVE_AVAIL_MEM # ifndef HAVE_CONFIG_H # define RETSIGTYPE void diff --git a/src/version.c b/src/version.c index 6d92a0360..604349469 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 212, +/**/ 211, /**/ 210, |