Skip to content

Commit 24af3ec

Browse files
h-eastchrisbra
authored andcommitted
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>
1 parent 48940d9 commit 24af3ec

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,8 @@ static char *(features[]) =
729729

730730
static int included_patches[] =
731731
{ /* Add new patch number below this line */
732+
/**/
733+
1925,
732734
/**/
733735
1924,
734736
/**/

src/vim.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,12 @@
315315
// cause compilation failures even though the headers are correct. For
316316
// a concrete example, gcc-3.2 enforces exception specifications, and
317317
// glibc-2.2.5 has them in their system headers.
318-
#ifndef PROTO
319-
# if !defined(__cplusplus) && defined(UNIX) \
320-
&& !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
321-
# include "auto/osdef.h" // bring missing declarations in
322-
# endif
318+
#if !defined(__cplusplus) && defined(UNIX) \
319+
&& !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
320+
# include "auto/osdef.h" // bring missing declarations in
321+
#endif
323322

323+
#ifndef PROTO
324324
# ifdef AMIGA
325325
# include "os_amiga.h"
326326
# endif

0 commit comments

Comments
 (0)