From df50f4643a1a60b9642050180b3c3ef378dbffd9 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Mon, 14 Apr 2003 14:08:03 +0000 Subject: [PATCH] PATCH: [ 716475 ] Reduce edtlib.h coupling --- Src/Merge.rc | 14 +++++++------- Src/MergeEditView.h | 3 +++ Src/StdAfx.h | 1 - Src/editlib/ccrystaleditview.inl | 4 ++++ Src/readme.txt | 4 ++++ 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index 36dca84e4..34378cbbf 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -412,13 +412,13 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 1,9,1,4 + PRODUCTVERSION 1,9,1,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG - FILEFLAGS 0x1L + FILEFLAGS 0x9L #else - FILEFLAGS 0x0L + FILEFLAGS 0x8L #endif FILEOS 0x4L FILETYPE 0x1L @@ -431,14 +431,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "\0" VALUE "FileDescription", "WinMerge Application\0" - VALUE "FileVersion", "999.999.999.999\0" + VALUE "FileVersion", "1.9.1.4\0" VALUE "InternalName", "WinMerge\0" VALUE "LegalCopyright", "© 1996-2001 Dean P. Grimm / Thingamahoochie Software\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "WinMerge.EXE\0" - VALUE "PrivateBuild", "\0" + VALUE "PrivateBuild", "CVS (Unreleased) Version 2003-04-08\0" VALUE "ProductName", "WinMerge\0" - VALUE "ProductVersion", "999.999.999.999\0" + VALUE "ProductVersion", "1.9.1.4\0" VALUE "SpecialBuild", "\0" END END diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h index 2516f133d..d6593fc36 100644 --- a/Src/MergeEditView.h +++ b/Src/MergeEditView.h @@ -18,6 +18,9 @@ static LPCTSTR crlfs[] = ///////////////////////////////////////////////////////////////////////////// // CMergeEditView view +#ifndef __EDTLIB_H +#include "edtlib.h" +#endif class CMergeEditView : public CCrystalEditViewEx { diff --git a/Src/StdAfx.h b/Src/StdAfx.h index 351cd401c..0b5c1cf41 100644 --- a/Src/StdAfx.h +++ b/Src/StdAfx.h @@ -35,7 +35,6 @@ int xisspecial (int c); int xisalpha (int c); int xisalnum (int c); -#include "edtlib.h" diff --git a/Src/editlib/ccrystaleditview.inl b/Src/editlib/ccrystaleditview.inl index 3577d0682..818a8981e 100644 --- a/Src/editlib/ccrystaleditview.inl +++ b/Src/editlib/ccrystaleditview.inl @@ -28,6 +28,10 @@ #include "CCrystalEditView.h" +#ifndef AFX_CCRYSTALTEXTBUFFER_H__AD7F2F49_6CB3_11D2_8C32_0080ADB86836__INCLUDED_ +#include "ccrystaltextbuffer.h" +#endif + inline BOOL CCrystalEditView:: GetOverwriteMode () const diff --git a/Src/readme.txt b/Src/readme.txt index b0f40d963..36d99fbe0 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2003-04-14 Perry + PATCH: [ 716475 ] Reduce edtlib.h coupling + WinMerge: MergeEditView.h StdAfx.h editlib/ccrystaleditview.inl + 2003-04-13 Kimmo PATCH: [ 719872 ] Use memory-mapped files when loading files WinMerge: files.h files.cpp Merge.dsp MergeDoc.h MergeDoc.cpp -- 2.11.0