From: Perry Rapp Date: Sun, 4 Dec 2005 19:02:33 +0000 (+0000) Subject: 2005-12-04 Perry X-Git-Tag: 2.16.5~5536 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e817002981007004d17be72f2df9058edd517d2c;p=winmerge-jp%2Fwinmerge-jp.git 2005-12-04 Perry PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static Src: codepage_detect.cpp --- diff --git a/Src/Changes.txt b/Src/Changes.txt index e1123af73..c970f971e 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -1,3 +1,7 @@ +2005-12-04 Perry + PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static + Src: codepage_detect.cpp + 2005-12-04 Jochen CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag diff --git a/Src/codepage_detect.cpp b/Src/codepage_detect.cpp index 719b00344..da77ac1f4 100644 --- a/Src/codepage_detect.cpp +++ b/Src/codepage_detect.cpp @@ -127,7 +127,7 @@ static unsigned demoGuessEncoding_rc(const char *src, size_t len) /** * @brief Try to deduce encoding for this file */ -unsigned GuessEncoding_from_bytes(LPCTSTR ext, const char *src, size_t len) +static unsigned GuessEncoding_from_bytes(LPCTSTR ext, const char *src, size_t len) { if (len > 4096) len = 4096;