[Winmerge-svn] SF.net SVN: winmerge: [5444] trunk/Src

[<ki...@us...>]

Revision: 5444
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5444&view=rev
Author:   kimmov
Date:     2008-06-06 23:48:49 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
PATCH: [ 1985997 ] Remove unnecessary #ifndef around includes
 Submitted by Marcel Gosselin

Modified Paths:
--------------
    trunk/Src/Common/CMoveConstraint.cpp
    trunk/Src/Common/CMoveConstraint.h
    trunk/Src/Common/CSubclass.cpp
    trunk/Src/Common/LanguageSelect.h
    trunk/Src/Common/UniFile.h
    trunk/Src/ConfirmFolderCopyDlg.h
    trunk/Src/DiffContext.h
    trunk/Src/DiffFileInfo.h
    trunk/Src/DiffItem.h
    trunk/Src/DiffItemList.h
    trunk/Src/DiffWrapper.h
    trunk/Src/DirCmpReport.h
    trunk/Src/DirCmpReportDlg.h
    trunk/Src/DirCompProgressDlg.h
    trunk/Src/DirDoc.h
    trunk/Src/FileFilterMgr.h
    trunk/Src/FileLocation.h
    trunk/Src/LoadSaveCodepageDlg.h
    trunk/Src/MergeDiffDetailView.h
    trunk/Src/MergeDoc.h
    trunk/Src/MergeEditView.h
    trunk/Src/OpenDlg.h
    trunk/Src/PluginManager.h
    trunk/Src/Plugins.cpp
    trunk/Src/Plugins.h
    trunk/Src/PropArchive.h
    trunk/Src/PropBackups.h
    trunk/Src/PropSyntaxColors.h
    trunk/Src/SaveClosingDlg.h
    trunk/Src/dllver.cpp
    trunk/Src/editlib/ccrystaleditview.inl
    trunk/Src/editlib/crystaleditviewex.h

Modified: trunk/Src/Common/CMoveConstraint.cpp
===================================================================
--- trunk/Src/Common/CMoveConstraint.cpp	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/Common/CMoveConstraint.cpp	2008-06-07 06:48:49 UTC (rev 5444)
@@ -17,13 +17,8 @@
 
 #include "StdAfx.h"
 
-#ifndef __AFXTEMPL_H__
 #include <afxtempl.h>       // MFC template collection classes
-#endif
-
-#ifndef __AFXEXT_H__
 #include <afxext.h> // needed for CFormView
-#endif
 
 #include "CMoveConstraint.h"
 

Modified: trunk/Src/Common/CMoveConstraint.h
===================================================================
--- trunk/Src/Common/CMoveConstraint.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/Common/CMoveConstraint.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -17,9 +17,7 @@
 #ifndef CMoveConstraint_h
 #define CMoveConstraint_h
 
-#ifndef __AFXTEMPL_H__
 #include <afxtempl.h>
-#endif
 
 class CFormView;
 

Modified: trunk/Src/Common/CSubclass.cpp
===================================================================
--- trunk/Src/Common/CSubclass.cpp	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/Common/CSubclass.cpp	2008-06-07 06:48:49 UTC (rev 5444)
@@ -18,9 +18,7 @@
 #include "StdAfx.h"
 #include "CSubclass.h"
 
-#ifndef __AFXTEMPL_H__
 #include <afxtempl.h>
-#endif
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

Modified: trunk/Src/Common/LanguageSelect.h
===================================================================
--- trunk/Src/Common/LanguageSelect.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/Common/LanguageSelect.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -3,17 +3,14 @@
  *
  * @brief Declaration file for CLanguageSelect dialog.
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #if !defined(AFX_LANGUAGESELECT_H__4395A84F_E8DF_11D1_BBCB_00A024706EDC__INCLUDED_)
 #define AFX_LANGUAGESELECT_H__4395A84F_E8DF_11D1_BBCB_00A024706EDC__INCLUDED_
 
 #include "LogFile.h"
-
-#ifndef CMoveConstraint_h
 #include "CMoveConstraint.h"
-#endif
 
 #include <vector>
 #include <string>

Modified: trunk/Src/Common/UniFile.h
===================================================================
--- trunk/Src/Common/UniFile.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/Common/UniFile.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -12,10 +12,7 @@
 #ifndef UniFile_h_included
 #define UniFile_h_included
 
-#ifndef sbuffer_h_included
 #include "sbuffer.h"
-#endif
-
 #include "unicoder.h"
 
 /**

Modified: trunk/Src/ConfirmFolderCopyDlg.h
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/ConfirmFolderCopyDlg.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -22,11 +22,8 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#ifndef CMoveConstraint_h
 #include "CMoveConstraint.h"
-#endif
 
-
 /**
  * @brief Dialog for item copy confirmation.
  */

Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DiffContext.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -10,17 +10,9 @@
 #define AFX_DIFFCONTEXT_H__D3CC86BE_F11E_11D2_826C_00A024706EDC__INCLUDED_
 #pragma once
 
-#ifndef _PATH_CONTEXT_H_
 #include "PathContext.h"
-#endif
-
-#ifndef _DIFF_FILE_INFO_H_INCLUDED
 #include "DiffFileInfo.h"
-#endif
-
-#ifndef _DIFF_ITEM_LIST_H_
 #include "DiffItemList.h"
-#endif
 
 class PackingInfo;
 class PrediffingInfo;

Modified: trunk/Src/DiffFileInfo.h
===================================================================
--- trunk/Src/DiffFileInfo.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DiffFileInfo.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -25,17 +25,9 @@
 #ifndef _DIFF_FILE_INFO_H_INCLUDED
 #define _DIFF_FILE_INFO_H_INCLUDED
 
-#ifndef _DIR_ITEM_H_INCLUDED
 #include "DirItem.h"
-#endif
-
-#ifndef FileTextEncoding_h_included
 #include "FileTextEncoding.h"
-#endif
-
-#ifndef FileTextStats_h_included
 #include "FileTextStats.h"
-#endif
 
 /**
  * @brief Class for fileflags and coding info.

Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DiffItem.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -9,9 +9,7 @@
 #ifndef _DIFF_ITEM_H_
 #define _DIFF_ITEM_H_
 
-#ifndef _DIFF_FILE_INFO_H_INCLUDED
 #include "DiffFileInfo.h"
-#endif
 
 /**
  * @brief Bitfield values for binary file sides.

Modified: trunk/Src/DiffItemList.h
===================================================================
--- trunk/Src/DiffItemList.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DiffItemList.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -3,15 +3,13 @@
  *
  *  @brief Declaration of DiffItemList
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef _DIFF_ITEM_LIST_H_
 #define _DIFF_ITEM_LIST_H_
 
-#ifndef _DIFF_ITEM_H_
 #include "DiffItem.h"
-#endif
 
 /**
  * @brief List of DiffItems
@@ -41,4 +39,4 @@
 	CList<DIFFITEM,DIFFITEM&> m_dirlist; /**< List of diffitems */
 };
 
-#endif // _DIFF_ITEM_LIST_H_
\ No newline at end of file
+#endif // _DIFF_ITEM_LIST_H_

Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DiffWrapper.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -21,21 +21,15 @@
  *
  * @date  Created: 2003-08-22
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef _DIFFWRAPPER_H
 #define _DIFFWRAPPER_H
 
 #include "FileLocation.h"
-
-#ifndef FileTextStats_h_included
 #include "FileTextStats.h"
-#endif
-
-#ifndef CompareOptions_h_included
 #include "CompareOptions.h"
-#endif
 
 class CDiffContext;
 class PrediffingInfo;

Modified: trunk/Src/DirCmpReport.h
===================================================================
--- trunk/Src/DirCmpReport.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DirCmpReport.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -4,16 +4,13 @@
  * @brief Declaration file for DirCmpReport.
  *
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef _DIRCMPREPORT_H_
 #define _DIRCMPREPORT_H_
 
-#ifndef _PATHCONTEXT_H_
 #include "PathContext.h"
-#endif
-
 #include "DirReportTypes.h"
 
 /**

Modified: trunk/Src/DirCmpReportDlg.h
===================================================================
--- trunk/Src/DirCmpReportDlg.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DirCmpReportDlg.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -4,16 +4,13 @@
  * @brief Declaration file for DirCmpReport Dialog.
  *
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef _DIRCMPREPORTDLG_H_
 #define _DIRCMPREPORTDLG_H_
 
-#ifndef DirReportTypes_h_included
 #include "DirReportTypes.h"
-#endif
-
 #include "SuperComboBox.h"
 
 /** 

Modified: trunk/Src/DirCompProgressDlg.h
===================================================================
--- trunk/Src/DirCompProgressDlg.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DirCompProgressDlg.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -9,9 +9,7 @@
 #if !defined(AFX_DIRCOMPPROGRESSDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
 #define AFX_DIRCOMPPROGRESSDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_
 
-#ifndef _COMPARESTATS_H_
 #include "CompareStats.h"
-#endif
 
 class CDirFrame;
 class CDirDoc;

Modified: trunk/Src/DirDoc.h
===================================================================
--- trunk/Src/DirDoc.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/DirDoc.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -30,11 +30,8 @@
 #define AFX_DIRDOC_H__0B17B4C1_356F_11D1_95CD_444553540000__INCLUDED_
 #pragma once
 
-#include "diffThread.h"
-
-#ifndef PluginManager_h_included
+#include "DiffThread.h"
 #include "PluginManager.h"
-#endif
 
 class CDirView;
 class CMergeDoc;

Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/FileFilterMgr.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -17,16 +17,14 @@
  *
  *  @brief Declaration file for FileFilterMgr
  */ 
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
-#ifndef FileFilter_h_included
-#define FileFilter_h_included
+#ifndef FileFilterMgr_h_included
+#define FileFilterMgr_h_included
 
 // Uses MFC C++ template containers
-#ifndef __AFXTEMPL_H__
 #include <afxtempl.h>
-#endif
 #include "pcre.h"
 
 struct FileFilterElement;
@@ -132,4 +130,4 @@
 void EmptyFilterList(FileFilterList & filterList);
 
 
-#endif // FileFilter_h_included
+#endif // FileFilterMgr_h_included

Modified: trunk/Src/FileLocation.h
===================================================================
--- trunk/Src/FileLocation.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/FileLocation.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -10,9 +10,7 @@
 #ifndef FileLocation_included
 #define FileLocation_included
 
-#ifndef FileTextEncoding_h_included
 #include "FileTextEncoding.h"
-#endif
 
 /**
  * @brief A structure containing file's path and encoding information.

Modified: trunk/Src/LoadSaveCodepageDlg.h
===================================================================
--- trunk/Src/LoadSaveCodepageDlg.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/LoadSaveCodepageDlg.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -3,7 +3,7 @@
  *
  * @brief Declaration of the dialog used to select codepages
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 
@@ -11,9 +11,7 @@
 #define AFX_LOADSAVECODEPAGEDLG_H__B9A16700_6F1A_4DF1_8EB3_0A1D772DCE91__INCLUDED_
 #pragma once
 
-#ifndef CMoveConstraint_h
 #include "CMoveConstraint.h"
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // CLoadSaveCodepageDlg dialog

Modified: trunk/Src/MergeDiffDetailView.h
===================================================================
--- trunk/Src/MergeDiffDetailView.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/MergeDiffDetailView.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -4,7 +4,7 @@
  *
  * @brief Declaration of CMergeDiffDetailView class
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 //
 //////////////////////////////////////////////////////////////////////
@@ -14,12 +14,9 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CMergeDiffDetailView view
-#ifndef __EDTLIB_H
 #include "edtlib.h"
-#endif
 
 
-
 /**
  * @brief Class for Diff Pane View
  *

Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/MergeDoc.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -22,7 +22,7 @@
  *
  * @brief Declaration of CMergeDoc class
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #if !defined(AFX_MERGEDOC_H__BBCD4F90_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
@@ -33,18 +33,9 @@
 #include "DiffWrapper.h"
 #include "DiffList.h"
 #include "stringdiffs.h"
-
-#ifndef _TEMP_FILE_
 #include "TempFile.h"
-#endif
-
-#ifndef _PATH_CONTEXT_H_
 #include "PathContext.h"
-#endif
-
-#ifndef _DIFF_FILE_INFO_H_INCLUDED
 #include "DiffFileInfo.h"
-#endif
 
 /**
  * @brief Additional action codes for WinMerge.

Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/MergeEditView.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -71,9 +71,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // CMergeEditView view
-#ifndef __EDTLIB_H
 #include "edtlib.h"
-#endif
 #include "GhostTextView.h"
 
 class IMergeEditStatus;

Modified: trunk/Src/OpenDlg.h
===================================================================
--- trunk/Src/OpenDlg.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/OpenDlg.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -33,10 +33,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // COpenDlg dialog
 #include "SuperComboBox.h"
-
-#ifndef CMoveConstraint_h
 #include "CMoveConstraint.h"
-#endif
 #include "FileTransform.h"
 
 class ProjectFile;

Modified: trunk/Src/PluginManager.h
===================================================================
--- trunk/Src/PluginManager.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/PluginManager.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -2,15 +2,10 @@
 #define PluginManager_h_included
 
 
-#if !defined(AFX_DIFFCONTEXT_H__D3CC86BE_F11E_11D2_826C_00A024706EDC__INCLUDED_)
 // defines IPluginInfos
 #include "DiffContext.h"
-#endif
-
-#ifndef FileTransform_h
 // defines PackingInfo and PrediffingInfo
 #include "FileTransform.h"
-#endif
 
 /**
  * @brief Cached plugin info for one particular file info

Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/Plugins.cpp	2008-06-07 06:48:49 UTC (rev 5444)
@@ -27,9 +27,7 @@
 // $Id$
 
 #include "StdAfx.h"
-#ifndef __AFXMT_H__
 #include <afxmt.h>
-#endif
 
 #include "pcre.h"
 #include "LogFile.h"

Modified: trunk/Src/Plugins.h
===================================================================
--- trunk/Src/Plugins.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/Plugins.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -23,16 +23,13 @@
  *
  *  @brief Declaration file for VBS Scriptlets, VB ActiveX DLL, VC++ COM DLL
  */ 
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef __PLUGINS_H__
 #define __PLUGINS_H__
 
-#ifndef _FileFilterMgr_included_
-#define _FileFilterMgr_included_
 #include "FileFilterMgr.h"
-#endif
 
 class CRegExp;
 
@@ -233,4 +230,4 @@
 BOOL InvokePrediffFile(LPCTSTR fileSource, LPCTSTR fileDest, int & nChanged, LPDISPATCH piScript);
 
 
-#endif //__PLUGINS_H__
\ No newline at end of file
+#endif //__PLUGINS_H__

Modified: trunk/Src/PropArchive.h
===================================================================
--- trunk/Src/PropArchive.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/PropArchive.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -4,17 +4,14 @@
  * @brief Declaration file for CPropArchive propertyheet
  *
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef _PROP_ARCHIVE_H_
 #define _PROP_ARCHIVE_H_
 
 #include "StatLink.h"
-
-#ifndef _IOPTIONSPANEL_H_
 #include "IOptionsPanel.h"
-#endif
 
 class COptionsMgr;
 

Modified: trunk/Src/PropBackups.h
===================================================================
--- trunk/Src/PropBackups.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/PropBackups.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -10,9 +10,7 @@
 #ifndef _PROPBACKUPS_H_
 #define _PROPBACKUPS_H_
 
-#ifndef _IOPTIONSPANEL_H_
 #include "IOptionsPanel.h"
-#endif
 
 class COptionsMgr;
 

Modified: trunk/Src/PropSyntaxColors.h
===================================================================
--- trunk/Src/PropSyntaxColors.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/PropSyntaxColors.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -4,17 +4,14 @@
  * @brief Declaration file for CPropSyntaxColors propertyheet
  *
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef _PROP_SYNTAX_COLORS_H_
 #define _PROP_SYNTAX_COLORS_H_
 
 #include "ColorButton.h"
-
-#ifndef _IOPTIONSPANEL_H_
 #include "IOptionsPanel.h"
-#endif
 
 class SyntaxColors;
 

Modified: trunk/Src/SaveClosingDlg.h
===================================================================
--- trunk/Src/SaveClosingDlg.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/SaveClosingDlg.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -19,17 +19,14 @@
  *
  * @brief Declaration file for SaveClosingDlg dialog
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 
 #ifndef _SAVECLOSINGDLG_H_
 #define _SAVECLOSINGDLG_H_
 
-
-#ifndef CMoveConstraint_h
 #include "CMoveConstraint.h"
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // SaveClosingDlg dialog

Modified: trunk/Src/dllver.cpp
===================================================================
--- trunk/Src/dllver.cpp	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/dllver.cpp	2008-06-07 06:48:49 UTC (rev 5444)
@@ -4,9 +4,7 @@
 
 #include "stdafx.h"
 // Uses MFC C++ template collection classes
-#ifndef __AFXTEMPL_H__
 #include <afxtempl.h>
-#endif
 // Need DLLGETVERSIONPROC from <shlwapi.h>
 #include <shlwapi.h>
 #include "dllver.h"

Modified: trunk/Src/editlib/ccrystaleditview.inl
===================================================================
--- trunk/Src/editlib/ccrystaleditview.inl	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/editlib/ccrystaleditview.inl	2008-06-07 06:48:49 UTC (rev 5444)
@@ -27,10 +27,7 @@
 #define __CCrystalEditView_INL_INCLUDED
 
 #include "CCrystalEditView.h"
-
-#ifndef AFX_CCRYSTALTEXTBUFFER_H__AD7F2F49_6CB3_11D2_8C32_0080ADB86836__INCLUDED_
 #include "ccrystaltextbuffer.h"
-#endif
 
 inline BOOL CCrystalEditView::
 GetOverwriteMode ()

Modified: trunk/Src/editlib/crystaleditviewex.h
===================================================================
--- trunk/Src/editlib/crystaleditviewex.h	2008-06-07 06:29:21 UTC (rev 5443)
+++ trunk/Src/editlib/crystaleditviewex.h	2008-06-07 06:48:49 UTC (rev 5444)
@@ -10,10 +10,7 @@
 #endif // _MSC_VER > 1000
 
 #include "ccrystaleditview.h"
-
-#ifndef __CRYSTALSYNTAXPARSER_H__
 #include "CrystalParser.h"
-#endif
 
 
 class EDITPADC_CLASS CCrystalEditViewEx : public CCrystalEditView  


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