diff options
| author | vimboss <devnull@localhost> | 2009-06-24 14:41:19 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-06-24 14:41:19 +0000 |
| commit | 0a3cc7be882bc33b481eaa5fc6fff0776714d8ea (patch) | |
| tree | 1fcf509dcec4dde465f3701ae9a8b59ac90a066b | |
| parent | c81f292b399ad9e64804c77b61db360fc5bc55d9 (diff) | |
| download | vim-0a3cc7be882bc33b481eaa5fc6fff0776714d8ea.tar.gz | |
| -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 7a54ee5c..aadaed77 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 6d92a036..60434946 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, |