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>

diff --git a/src/findfile.c b/src/findfile.c
index 008338cdaeb5b20b80744c4f14959ad629a258dd..c1318384e4dd35b0a8d4222433564e537042ceca 100644 (file)
--- 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 653690b000102f0da4fa426d9d64901593f3924f..5e2f7b0f46bd48cbbadfd2e7a3d5b67192f3d76f 100644 (file)
--- 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 72838bda2f5a3034ca8e20740cc8e6002ed2378c..fd752109f562880b2bbbb7ea05da0134fbc2330f 100644 (file)
--- 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 4d03167a738712c5a57f9196e2c6b2e6768bb9fc..ecf543523a3983ec3d3a8301cbb0702b7422e99f 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 */
+/**/
+    1803,
 /**/
     1802,
 /**/