From: sdottaka <sdottaka@users.sourceforge.net>
Date: Sat, 16 May 2015 13:08:42 +0000 (+0900)
Subject: diff.h: reduce compiler warnings
X-Git-Tag: 2.16.4+-jp-10~850^2~72
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6dc8495b0d0e807c202df7b84fdf45074f293560;p=winmerge-jp%2Fwinmerge-jp.git

diff.h: reduce compiler warnings

--HG--
branch : stable
---

diff --git a/Src/diffutils/src/diff.h b/Src/diffutils/src/diff.h
index 63adbae42..36e84e87b 100644
--- a/Src/diffutils/src/diff.h
+++ b/Src/diffutils/src/diff.h
@@ -308,6 +308,7 @@ EXTERN FILE *outfile;
 /* analyze.c */
 /* WinMerge: add last two params */
 struct change * diff_2_files PARAMS((struct file_data[], int, int *, int, int*));
+void moved_block_analysis(struct change ** pscript, struct file_data fd[]);
 
 /* context.c */
 void print_context_header PARAMS((struct file_data[], int));
@@ -370,11 +371,13 @@ void setup_output PARAMS((char const *, char const *, int));
 void translate_range PARAMS((struct file_data const *, int, int, int *, int *));
 void cleanup_file_buffers(struct file_data fd[]);
 int FileIsBinary(int fd);
+int isunicode(unsigned char *pBuffer, int size);
 
 /* version.c */
 extern char const version_string[];
 
 #ifdef __cplusplus
+#undef HUGE
 }
 #endif