Fix mixed eol-style

diff --git a/Src/FileVersion.cpp b/Src/FileVersion.cpp
index bf93214..ac4e7bc 100644 (file)
--- a/Src/FileVersion.cpp
+++ b/Src/FileVersion.cpp
@@ -10,8 +10,8 @@
 #include "UnicodeString.h"
 
 #ifndef HIWORD
-#define LOWORD(l) ((unsigned short)((l) & 0xffff))\r
-#define HIWORD(l) ((unsigned short)((l) >> 16))\r
+#define LOWORD(l) ((unsigned short)((l) & 0xffff))
+#define HIWORD(l) ((unsigned short)((l) >> 16))
 #endif
 
 /**

diff --git a/Testing/FolderCompare/FolderCompare.cpp b/Testing/FolderCompare/FolderCompare.cpp
index afd6742..1d21104 100644 (file)
--- a/Testing/FolderCompare/FolderCompare.cpp
+++ b/Testing/FolderCompare/FolderCompare.cpp
@@ -1,22 +1,22 @@
-#include "DiffContext.h"\r
-#include "CompareStats.h"\r
-#include "DiffThread.h"\r
-#include "DiffWrapper.h"\r
-#include "FileFilterHelper.h"\r
-#include <Poco/Thread.h>\r
-\r
-int main()\r
-{\r
+#include "DiffContext.h"
+#include "CompareStats.h"
+#include "DiffThread.h"
+#include "DiffWrapper.h"
+#include "FileFilterHelper.h"
+#include <Poco/Thread.h>
+
+int main()
+{
        CompareStats cmpstats(2);
 
        FileFilterHelper filter;
        filter.UseMask(true);
        filter.SetMask(_T("*.cpp;*.c;*.h"));
 
-       CDiffContext ctx(\r
-               PathContext(_T("d:/dev/winmerge/winmerge-3pane/winmerge-v2/Src"), _T("d:/dev/winmerge/winmerge-3pane/trunk/Src")),\r
-               CMP_CONTENT);\r
-\r
+       CDiffContext ctx(
+               PathContext(_T("d:/dev/winmerge/winmerge-3pane/winmerge-v2/Src"), _T("d:/dev/winmerge/winmerge-3pane/trunk/Src")),
+               CMP_CONTENT);
+
        DIFFOPTIONS options = {0};
        options.nIgnoreWhitespace = false;
        options.bIgnoreBlankLines = false;
@@ -58,6 +58,6 @@ int main()
                std::cout << di.diffFileInfo[0].filename << ":" << di.diffcode.isResultDiff() << std::endl;
 #endif
        }
-\r
-       return 0;\r
+
+       return 0;
 }
\ No newline at end of file