changeset 6737:9a07975061ed v7.4.692

patch 7.4.692 for Problem: Defining SOLARIS for no good reason. (Danek Duvall) Solution: Remove it.
author Bram Moolenaar <bram@vim.org>
date Thu, 09 Apr 2015 22:08:21 +0200
parents 9ae4737fc48f
children 39e174e02dec
files src/os_unix.h src/version.c
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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,