patch 9.1.1705: time.h include is available on all platforms

Problem:  time.h include is available on all platforms
Solution: Remove ifdef guards and simply include it in all source files,
          get rid of double include in spellfile.c (Damien Lejay).

closes: #18075

Signed-off-by: Damien Lejay <damien@lejay.be>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/memline.c b/src/memline.c
index b93eb0a48e3887f05837911f334b98c998cff479..25ecd97fcb5cdfe34b9c6aa1ef714a7038921d00 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -44,9 +44,7 @@
 
 #include "vim.h"
 
-#ifndef UNIX           // it's in os_unix.h for Unix
-# include <time.h>
-#endif
+#include <time.h>
 
 #if defined(SASC) || defined(__amigaos4__)
 # include <proto/dos.h>            // for Open() and Close()

diff --git a/src/spell.c b/src/spell.c
index 2281986435362a1a74f1e407d49335b579ba1355..80ce131e5c103abce6c8b916307ea747699433d0 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -60,9 +60,7 @@
 
 #if defined(FEAT_SPELL) || defined(PROTO)
 
-#ifndef UNIX           // it's in os_unix.h for Unix
-# include <time.h>     // for time_t
-#endif
+#include <time.h>
 
 #define REGION_ALL 0xff                // word valid in all regions
 

diff --git a/src/spellfile.c b/src/spellfile.c
index 0b9536dc16c9a28dbfe43b8176b07e8430f394f6..e8a7f1af6560ec32b0d0d48ef21c9d16d6e759a5 100644 (file)
--- a/src/spellfile.c
+++ b/src/spellfile.c
@@ -241,13 +241,7 @@
 
 #if defined(FEAT_SPELL) || defined(PROTO)
 
-#ifndef UNIX           // it's in os_unix.h for Unix
-# include <time.h>     // for time_t
-#endif
-
-#ifndef UNIX           // it's in os_unix.h for Unix
-# include <time.h>     // for time_t
-#endif
+#include <time.h>      // for time_t
 
 // Special byte values for <byte>.  Some are only used in the tree for
 // postponed prefixes, some only in the other trees.  This is a bit messy...

diff --git a/src/version.c b/src/version.c
index 49f7975e6f9307bcccc7523f4d8ae37ac143d852..595c100f08c5b496728df0cdeebf7e58663b797d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1705,
 /**/
     1704,
 /**/