[Winmerge-svn] SF.net SVN: winmerge:[7483] branches/R2_14/Src

[<ge...@us...>]

Revision: 7483
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7483&view=rev
Author:   gerundt
Date:     2010-12-28 20:50:55 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
Fix warning about memicmp()

Modified Paths:
--------------
    branches/R2_14/Src/codepage_detect.cpp
    branches/R2_14/Src/markdown.cpp

Modified: branches/R2_14/Src/codepage_detect.cpp
===================================================================
--- branches/R2_14/Src/codepage_detect.cpp	2010-12-28 20:27:05 UTC (rev 7482)
+++ branches/R2_14/Src/codepage_detect.cpp	2010-12-28 20:50:55 UTC (rev 7483)
@@ -45,7 +45,7 @@
 {
 	int len = strlen(prefix);
 	if (len)
-		if (memicmp(text, prefix, len) == 0)
+		if (_memicmp(text, prefix, len) == 0)
 			return text + len;
 	return 0;
 }
@@ -100,7 +100,7 @@
 				{
 					char *pchValue = pchKey + cchKey;
 					int cchValue = strcspn(pchValue += strspn(pchValue, "= \t\r\n"), "; \t\r\n");
-					if (cchKey >= 7 && memicmp(pchKey, "charset", 7) == 0 && (cchKey == 7 || strchr(" \t\r\n", pchKey[7])))
+					if (cchKey >= 7 && _memicmp(pchKey, "charset", 7) == 0 && (cchKey == 7 || strchr(" \t\r\n", pchKey[7])))
 					{
 						pchValue[cchValue] = '\0';
 						// Is it an encoding name known to charsets module ?

Modified: branches/R2_14/Src/markdown.cpp
===================================================================
--- branches/R2_14/Src/markdown.cpp	2010-12-28 20:27:05 UTC (rev 7482)
+++ branches/R2_14/Src/markdown.cpp	2010-12-28 20:50:55 UTC (rev 7483)
@@ -389,7 +389,7 @@
 
 CMarkdown::CMarkdown(const char *upper, const char *ahead, unsigned flags):
 first(0), lower(0), upper(upper), ahead(ahead),
-memcmp(flags & IgnoreCase ? ::memicmp : ::memcmp),
+memcmp(flags & IgnoreCase ? ::_memicmp : ::memcmp),
 utags(flags & HtmlUTags ? htmlUTags : NULL)
 {
 	if (CMarkdown::ahead > CMarkdown::upper)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.