patch 9.1.1925: make depend does not include osdef.h
Commit:
https://github.com/vim/vim/commit/24af3eca684d045499a2e55afed66ee4441713b2
Author: Hirohito Higashi <[email protected]>
Date: Sun Nov 23 18:39:36 2025 +0000
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/version.c b/src/version.c
index 65e2f58f8..a02a9e2d8 100644
--- 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 e41a68f1c..2b37da2af 100644
--- 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
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1vNF58-000BRe-E7%40256bit.org.
