From de1502f2b48f77c98547a66b324e76be422228d3 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 9 Apr 2015 22:08:21 +0200 Subject: patch 7.4.692 for Problem: Defining SOLARIS for no good reason. (Danek Duvall) Solution: Remove it. --- src/os_unix.h | 7 ------- src/version.c | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/os_unix.h b/src/os_unix.h index 4a353388c..4220534b9 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -64,13 +64,6 @@ # include /* defines BSD, if it's a BSD system */ #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 diff --git a/src/version.c b/src/version.c index 1ae5f37e9..95dc69d90 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 692, /**/ 691, /**/ -- cgit v1.2.1