From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 29 Apr 2019 02:17:38 +0000 (+0900)
Subject: Use libXDiff library(8): Add support for Classic Mac EOL (\r) (2)
X-Git-Tag: 2.16.5~341
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ad4b05a323b05f74714e7fbb417a349853f14f1;p=winmerge-jp%2Fwinmerge-jp.git

Use libXDiff library(8): Add support for Classic Mac EOL (\r) (2)
---

diff --git a/Externals/xdiff/xutils.c b/Externals/xdiff/xutils.c
index d2bc02080..6dac6b91c 100644
--- a/Externals/xdiff/xutils.c
+++ b/Externals/xdiff/xutils.c
@@ -122,6 +122,11 @@ void *xdl_cha_alloc(chastore_t *cha) {
 	return data;
 }
 
+static inline int is_eol(char const* ptr, char const* top)
+{
+	return (*ptr == '\n' || (*ptr == '\r' && (ptr == top - 1 || *(ptr + 1) != '\n')));
+}
+
 long xdl_guess_lines(mmfile_t *mf, long sample) {
 	long nl = 0, size, tsize = 0;
 	char const *data, *cur, *top;
@@ -156,11 +161,6 @@ int xdl_blankline(const char *line, long size, long flags)
 	return (i == size);
 }
 
-static inline int is_eol(char const* ptr, char const* top)
-{
-	return (*ptr == '\n' || (*ptr == '\r' && (ptr == top - 1 || *(ptr + 1) != '\n')));
-}
-
 /*
  * Have we eaten everything on the line, except for an optional
  * CR at the very end?