OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5129daf
)
BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
author
Kimmo Varis
<kimmov@gmail.com>
Sun, 1 Jan 2006 16:04:06 +0000
(16:04 +0000)
committer
Kimmo Varis
<kimmov@gmail.com>
Sun, 1 Jan 2006 16:04:06 +0000
(16:04 +0000)
Src/Changes.txt
patch
|
blob
|
history
Src/DirScan.cpp
patch
|
blob
|
history
diff --git
a/Src/Changes.txt
b/Src/Changes.txt
index
af0c80a
..
d43c14a
100644
(file)
--- a/
Src/Changes.txt
+++ b/
Src/Changes.txt
@@
-3,6
+3,8
@@
Src: DirScan.cpp
PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
Src/editlib: ccrystaltextview.cpp
+ BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
+ Src: DirScan.cpp
2005-12-31 Perry
PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
diff --git
a/Src/DirScan.cpp
b/Src/DirScan.cpp
index
3727d0b
..
d64ccdc
100644
(file)
--- a/
Src/DirScan.cpp
+++ b/
Src/DirScan.cpp
@@
-390,7
+390,7
@@
void CompareDiffItem(DIFFITEM di, CDiffContext * pCtxt)
// Add possible binary flag for unique items
if (diffCode & DIFFCODE::BIN)
di.diffcode |= DIFFCODE::BIN;
- StoreDiffResult(di, pCtxt, &diffdata
, &sRule
);
+ StoreDiffResult(di, pCtxt, &diffdata);
}
else
{