---
 imap/src/c-client/mail.h     |    8 ++++++++
 imap/src/osdep/unix/os_slx.h |    8 ++++++++
 include/system.h             |    8 ++++++++
 pico/osdep/shell.c           |    3 +--
 4 files changed, 25 insertions(+), 2 deletions(-)

Index: alpine-2.25/imap/src/c-client/mail.h
===================================================================
--- alpine-2.25.orig/imap/src/c-client/mail.h
+++ alpine-2.25/imap/src/c-client/mail.h
@@ -1942,6 +1942,14 @@ long INWAIT (long seconds);
 int PSOUT (char *s);
 int PSOUTR (SIZEDTEXT *s);
 int PFLUSH (void);
+/*
+ * Shuts up spurious
+ * "warning: suggest parentheses around assignment used as truth value"
+ * which occurs in gcc4.2.1 and older when an assigment is used in a
+ * if, which works just fine and is not interpreted as always true:
+ */
+#define if(x) if((x))
+#define while(x) while((x))
 
 /* XOAUTH2 and AUTHBEARER Client-Side Support */
 
Index: alpine-2.25/imap/src/osdep/unix/os_slx.h
===================================================================
--- alpine-2.25.orig/imap/src/osdep/unix/os_slx.h
+++ alpine-2.25/imap/src/osdep/unix/os_slx.h
@@ -70,3 +70,11 @@ int portable_utime (char *file,time_t ti
 #include "ftl.h"
 #include "nl.h"
 #include "tcp.h"
+/*
+ * Shuts up spurious
+ * "warning: suggest parentheses around assignment used as truth value"
+ * which occurs ing gcc4.2.1 and older when an assigment is used in a
+ * if, which works just fine and is not iterpreted as always true:
+ */
+#define if(x) if((x))
+#define while(x) while((x))
Index: alpine-2.25/include/system.h
===================================================================
--- alpine-2.25.orig/include/system.h
+++ alpine-2.25/include/system.h
@@ -389,4 +389,12 @@ typedef int gid_t;
 # define LOCAL_PASSWD_CACHE
 #endif
 
+/*
+ * Shuts up spurious
+ * "warning: suggest parentheses around assignment used as truth value"
+ * which occurs ing gcc4.2.1 and older when an assigment is used in a
+ * if, which works just fine and is not iterpreted as always true:
+ */
+#define if(x) if((x))
+#define while(x) while((x))
 #endif /* _SYSTEM_INCLUDED */
Index: alpine-2.25/pico/osdep/shell.c
===================================================================
--- alpine-2.25.orig/pico/osdep/shell.c
+++ alpine-2.25/pico/osdep/shell.c
@@ -98,7 +98,6 @@ bktoshell(int f, int n)
 
     if(gmode&MDSPWN){
 	char *shell;
-	int   dummy = 1;
 
 	vttidy();
 	movecursor(0, 0);
@@ -106,7 +105,7 @@ bktoshell(int f, int n)
 	printf("\n\n\nUse \"exit\" to return to Pi%s\n",
 	       (gmode & MDBRONLY) ? "lot" : "co");
 	system((shell = (char *)getenv("SHELL")) ? shell : "/bin/csh");
-	rtfrmshell(dummy);	/* fixup tty */
+	rtfrmshell(0);	/* fixup tty */
     }
     else {
 	movecursor(term.t_nrow-1, 0);