diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-04-09 22:08:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-04-09 22:08:21 +0200 |
| commit | de1502f2b48f77c98547a66b324e76be422228d3 (patch) | |
| tree | 38264037e693eda0ec2cd4e843a8984c830371a5 | |
| parent | f6303878274b9aedfb9ac5b80d95002965093e5b (diff) | |
patch 7.4.692 for Problem: Defining SOLARIS for no good reason. (Danek Duvall)v7.4.692
Solution: Remove it.
| -rw-r--r-- | src/os_unix.h | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/os_unix.h b/src/os_unix.h index 4a353388c0..4220534b93 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -65,13 +65,6 @@ #endif /* - * Sun defines FILE on SunOS 4.x.x, Solaris has a typedef for FILE - */ -#if defined(sun) && !defined(FILE) -# define SOLARIS -#endif - -/* * Using getcwd() is preferred, because it checks for a buffer overflow. * Don't use getcwd() on systems do use system("sh -c pwd"). There is an * autoconf check for this. diff --git a/src/version.c b/src/version.c index 1ae5f37e97..95dc69d900 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 692, +/**/ 691, /**/ 690, |