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 4a353388c047506e64e04f828b59b427cc43dcc9..4220534b93cf11617bf5add9a8e3ab283e942c49 100644 (file)
--- 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 1ae5f37e97806f6e982fbb82fc7b618b6e5c9111..95dc69d90043baf1c859b190ec2eabeec67585b0 100644 (file)
--- 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,
 /**/