patch 9.1.1925: make depend does not include osdef.h

Problem:  make depend does not add osdef.h for the dependencies
          (Drew Vogel)
Solution: Move ifdef PROTO (Hirohito Higashi).

fixes: #18777
closes: #18796

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/version.c b/src/version.c
index 65e2f58f80de9ca8d213212f000fad3dc3ca69ec..a02a9e2d84a46e1075e49dc6a06fd8bf051b0eee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1925,
 /**/
     1924,
 /**/

diff --git a/src/vim.h b/src/vim.h
index e41a68f1c2855566142729e0503dc1fa6d3f3c20..2b37da2affb7b0904ec497d8f08176887e410940 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -315,12 +315,12 @@
 // cause compilation failures even though the headers are correct.  For
 // a concrete example, gcc-3.2 enforces exception specifications, and
 // glibc-2.2.5 has them in their system headers.
-#ifndef PROTO
-# if !defined(__cplusplus) && defined(UNIX) \
-       && !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
-#  include "auto/osdef.h"      // bring missing declarations in
-# endif
+#if !defined(__cplusplus) && defined(UNIX) \
+       && !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
+# include "auto/osdef.h"       // bring missing declarations in
+#endif
 
+#ifndef PROTO
 # ifdef AMIGA
 #  include "os_amiga.h"
 # endif