Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge

Conflicts:
	include/platform.h

1 files changed, 3 insertions, 1 deletions

diff --git a/editors/diff.c b/editors/diff.c
index 8c0a31f47..3a3334640 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -693,10 +693,12 @@ static bool diff(FILE* fp[2], char *file[2])
 
 static int diffreg(char *file[2])
 {
-        FILE *fp[2] = { stdin, stdin };
+        FILE *fp[2];
         bool binary = false, differ = false;
         int status = STATUS_SAME, i;
 
+        fp[0] = stdin;
+        fp[1] = stdin;
         for (i = 0; i < 2; i++) {
                 int fd = open_or_warn_stdin(file[i]);
                 if (fd == -1)