12 files changed, 24 insertions, 0 deletions
diff --git a/imap/src/osdep/amiga/dummy.c b/imap/src/osdep/amiga/dummy.c
index cb3b45bd..b33297e8 100644
--- a/imap/src/osdep/amiga/dummy.c
+++ b/imap/src/osdep/amiga/dummy.c
@@ -27,7 +27,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
diff --git a/imap/src/osdep/amiga/mbx.c b/imap/src/osdep/amiga/mbx.c
index 3cc89c94..bf3aa0ac 100644
--- a/imap/src/osdep/amiga/mbx.c
+++ b/imap/src/osdep/amiga/mbx.c
@@ -37,7 +37,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
diff --git a/imap/src/osdep/amiga/mh.c b/imap/src/osdep/amiga/mh.c
index a7b56e8c..02bb917c 100644
--- a/imap/src/osdep/amiga/mh.c
+++ b/imap/src/osdep/amiga/mh.c
@@ -27,7 +27,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
diff --git a/imap/src/osdep/amiga/mix.c b/imap/src/osdep/amiga/mix.c
index 9ab3442c..9c5ad9da 100644
--- a/imap/src/osdep/amiga/mix.c
+++ b/imap/src/osdep/amiga/mix.c
@@ -26,7 +26,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
diff --git a/imap/src/osdep/amiga/mmdf.c b/imap/src/osdep/amiga/mmdf.c
index e962434e..8e26a6c1 100644
--- a/imap/src/osdep/amiga/mmdf.c
+++ b/imap/src/osdep/amiga/mmdf.c
@@ -28,7 +28,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include <signal.h>
 #include "mail.h"
 #include "osdep.h"
diff --git a/imap/src/osdep/amiga/mtx.c b/imap/src/osdep/amiga/mtx.c
index 4c989564..1502b86c 100644
--- a/imap/src/osdep/amiga/mtx.c
+++ b/imap/src/osdep/amiga/mtx.c
@@ -37,7 +37,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
diff --git a/imap/src/osdep/amiga/mx.c b/imap/src/osdep/amiga/mx.c
index 7e2b022e..f2d6b3d3 100644
--- a/imap/src/osdep/amiga/mx.c
+++ b/imap/src/osdep/amiga/mx.c
@@ -30,7 +30,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <pwd.h>
diff --git a/imap/src/osdep/amiga/news.c b/imap/src/osdep/amiga/news.c
index 9c9f738a..34ad6b45 100644
--- a/imap/src/osdep/amiga/news.c
+++ b/imap/src/osdep/amiga/news.c
@@ -30,7 +30,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <sys/stat.h>
diff --git a/imap/src/osdep/amiga/os_ami.c b/imap/src/osdep/amiga/os_ami.c
index 9f0d27b0..90d611cc 100644
--- a/imap/src/osdep/amiga/os_ami.c
+++ b/imap/src/osdep/amiga/os_ami.c
@@ -39,7 +39,9 @@
 #include <netdb.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include <pwd.h>
 #include "misc.h"
 
diff --git a/imap/src/osdep/amiga/phile.c b/imap/src/osdep/amiga/phile.c
index ce72d0a9..e01eec22 100644
--- a/imap/src/osdep/amiga/phile.c
+++ b/imap/src/osdep/amiga/phile.c
@@ -30,7 +30,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include <signal.h>
 #include "mail.h"
 #include "osdep.h"
diff --git a/imap/src/osdep/amiga/tenex.c b/imap/src/osdep/amiga/tenex.c
index 0982573f..c3f95e5a 100644
--- a/imap/src/osdep/amiga/tenex.c
+++ b/imap/src/osdep/amiga/tenex.c
@@ -42,7 +42,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include "mail.h"
 #include "osdep.h"
 #include <sys/stat.h>
diff --git a/imap/src/osdep/amiga/unix.c b/imap/src/osdep/amiga/unix.c
index be3c437b..e553662f 100644
--- a/imap/src/osdep/amiga/unix.c
+++ b/imap/src/osdep/amiga/unix.c
@@ -40,7 +40,9 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifndef errno
 extern int errno;		/* just in case */
+#endif
 #include <signal.h>
 #include "mail.h"
 #include "osdep.h"