mirror of
https://github.com/vim/vim.git
synced 2025-10-18 07:54:29 -04:00
patch 9.1.1803: Amiga: build errors
Problem: Amiga: build errors Solution: Update preprocessor conditionals (Ola Söder). closes: #18423 Signed-off-by: Ola Söder <rolfkopman@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
91ac18cb03
commit
02f8d2ebd5
@@ -2979,9 +2979,12 @@ simplify_filename(char_u *filename)
|
|||||||
p = getnextcomp(p);
|
p = getnextcomp(p);
|
||||||
}
|
}
|
||||||
} while (*p != NUL);
|
} while (*p != NUL);
|
||||||
#endif // !AMIGA
|
|
||||||
|
|
||||||
return (size_t)(p_end - filename);
|
return (size_t)(p_end - filename);
|
||||||
|
#else
|
||||||
|
// Don't touch Amiga filenames
|
||||||
|
return STRLEN(filename);
|
||||||
|
#endif // !AMIGA
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(FEAT_EVAL) || defined(PROTO)
|
#if defined(FEAT_EVAL) || defined(PROTO)
|
||||||
|
@@ -248,7 +248,7 @@ EXTERN int did_wait_return INIT(= FALSE); // wait_return() was used and
|
|||||||
EXTERN int need_maketitle INIT(= TRUE); // call maketitle() soon
|
EXTERN int need_maketitle INIT(= TRUE); // call maketitle() soon
|
||||||
|
|
||||||
EXTERN int quit_more INIT(= FALSE); // 'q' hit at "--more--" msg
|
EXTERN int quit_more INIT(= FALSE); // 'q' hit at "--more--" msg
|
||||||
#if defined(UNIX) || defined(VMS) || defined(MACOS_X)
|
#if defined(UNIX) || defined(VMS) || defined(MACOS_X) || defined(AMIGA)
|
||||||
EXTERN int newline_on_exit INIT(= FALSE); // did msg in altern. screen
|
EXTERN int newline_on_exit INIT(= FALSE); // did msg in altern. screen
|
||||||
EXTERN int intr_char INIT(= 0); // extra interrupt character
|
EXTERN int intr_char INIT(= 0); // extra interrupt character
|
||||||
#endif
|
#endif
|
||||||
|
@@ -5230,7 +5230,7 @@ typedef struct
|
|||||||
#define KEYVALUE_ENTRY(k, v) \
|
#define KEYVALUE_ENTRY(k, v) \
|
||||||
{(k), {((char_u *)v), STRLEN_LITERAL(v)}}
|
{(k), {((char_u *)v), STRLEN_LITERAL(v)}}
|
||||||
|
|
||||||
#if defined(UNIX) || defined(MSWIN) || defined(VMS)
|
#if defined(UNIX) || defined(MSWIN) || defined(VMS) || defined(AMIGA)
|
||||||
// Defined as signed, to return -1 on error
|
// Defined as signed, to return -1 on error
|
||||||
struct cellsize {
|
struct cellsize {
|
||||||
int cs_xpixel;
|
int cs_xpixel;
|
||||||
|
@@ -729,6 +729,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1803,
|
||||||
/**/
|
/**/
|
||||||
1802,
|
1802,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user