patch 9.1.1803: Amiga: build errors
Commit:
https://github.com/vim/vim/commit/02f8d2ebd5cbccb5f04e5764bd4ffdaf3db6fd50
Author: Ola Söder <[email protected]>
Date: Sun Sep 28 17:48:43 2025 +0000
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/findfile.c b/src/findfile.c
index 008338cda..c1318384e 100644
--- a/src/findfile.c
+++ b/src/findfile.c
@@ -2979,9 +2979,12 @@ simplify_filename(char_u *filename)
p = getnextcomp(p);
}
} while (*p != NUL);
-#endif // !AMIGA
return (size_t)(p_end - filename);
+#else
+ // Don't touch Amiga filenames
+ return STRLEN(filename);
+#endif // !AMIGA
}
#if defined(FEAT_EVAL) || defined(PROTO)
diff --git a/src/globals.h b/src/globals.h
index 653690b00..5e2f7b0f4 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -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 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 intr_char INIT(= 0); // extra interrupt character
#endif
diff --git a/src/structs.h b/src/structs.h
index 72838bda2..fd752109f 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -5230,7 +5230,7 @@ typedef struct
#define KEYVALUE_ENTRY(k, 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
struct cellsize {
int cs_xpixel;
diff --git a/src/version.c b/src/version.c
index 4d03167a7..ecf543523 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 */
+/**/
+ 1803,
/**/
1802,
/**/
--
--
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/E1v2vgt-00HCpx-Rf%40256bit.org.
