From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 9 Apr 2015 20:08:21 +0000 (+0200)
Subject: patch 7.4.692 for Problem: Defining SOLARIS for no good reason. (Danek Duvall)
X-Git-Tag: v7.4.692
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de1502f2b48f77c98547a66b324e76be422228d3;p=thirdparty%2Fvim.git

patch 7.4.692 for Problem: Defining SOLARIS for no good reason. (Danek Duvall)
Solution:   Remove it.
---

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
@@ -64,13 +64,6 @@
 # include <sys/param.h>	    /* 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 1ae5f37e97..95dc69d900 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,
 /**/