1 files changed, 4 insertions, 19 deletions

diff --git a/editors/patch.c b/editors/patch.c
index 8837d1751..ee0ccd384 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -57,9 +57,7 @@ struct double_list {
         struct double_list *next;
         struct double_list *prev;
         char *data;
-#if ENABLE_PLATFORM_MINGW32
         int no_newline;
-#endif
 };
 
 // Free all the elements of a linked list
@@ -79,11 +77,7 @@ static void dlist_free(struct double_list *list, void (*freeit)(void *data))
 static struct double_list *dlist_add(struct double_list **list, char *data)
 {
         struct double_list *llist;
-#if ENABLE_PLATFORM_MINGW32
         struct double_list *line = xzalloc(sizeof(*line));
-#else
-        struct double_list *line = xmalloc(sizeof(*line));
-#endif
 
         line->data = data;
         llist = *list;
@@ -147,10 +141,8 @@ static void do_line(void *data)
 
         if (TT.state > 1 && *dlist->data != TT.state)
                 fdprintf(TT.state == 2 ? 2 : TT.fileout,
-#if ENABLE_PLATFORM_MINGW32
-                        dlist->no_newline && TT.state != 2 ? "%s" :
-#endif
-                        "%s\n", dlist->data + (TT.state > 3 ? 1 : 0));
+                        dlist->no_newline && TT.state != 2 ? "%s" : "%s\n",
+                        dlist->data + (TT.state > 3 ? 1 : 0));
 
         if (PATCH_DEBUG) fdprintf(2, "DO %d: %s\n", TT.state, dlist->data);
 
@@ -443,7 +435,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                 // Are we assembling a hunk?
                 if (state >= 2) {
-#if ENABLE_PLATFORM_MINGW32
                         switch (*patchline) {
                         case '\\':
                                 // '\ No newline at end of file' detected, mark
@@ -455,9 +446,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         case ' ':
                         case '+':
                         case '-':
-#else
-                if (*patchline == ' ' || *patchline == '+' || *patchline == '-') {
-#endif
                                 dlist_add(&TT.current_hunk, patchline);
 
                                 if (*patchline != '+') oldlen--;
@@ -469,9 +457,9 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                                 // If we've consumed all expected hunk lines, apply the hunk.
 
-#if ENABLE_PLATFORM_MINGW32
                                 if (!oldlen && !newlen) {
-                                        // Peek ahead for '\ No newline at end of file'
+                                        // Peek ahead for '\ No newline at end of file', mark
+                                        // previous line, if it exists.
                                         int c = getchar();
                                         ungetc(c, stdin);
                                         if (c == '\\') {
@@ -483,9 +471,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                         }
                                         state = apply_one_hunk();
                                 }
-#else
-                                if (!oldlen && !newlen) state = apply_one_hunk();
-#endif
                                 continue;
                         }
                         fail_hunk();