From 8c1f9c95c676de2777985828ae1af607e3fb6cf6 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 30 Oct 2003 19:26:18 +0000 Subject: [PATCH] Comment out GetIP() to fix compiling by including coretools.h --- Src/Common/coretools.cpp | 7 +++++-- Src/Common/coretools.h | 2 +- Src/readme.txt | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Src/Common/coretools.cpp b/Src/Common/coretools.cpp index 899285b82..aca011cbc 100644 --- a/Src/Common/coretools.cpp +++ b/Src/Common/coretools.cpp @@ -189,7 +189,10 @@ CString GetCDPath() } - +/* + Commented out - can't use this file by just including + coretools.h because of gethostaname() & gethostbyname(). + BOOL GetIP(LPTSTR straddr) { char szHostname[100]; @@ -213,7 +216,7 @@ BOOL GetIP(LPTSTR straddr) *straddr=_T('\0'); return FALSE; } - +*/ DWORD FPRINTF(HANDLE hf, LPCTSTR fmt, ... ) { diff --git a/Src/Common/coretools.h b/Src/Common/coretools.h index a66fd0a9a..d37d6fa9b 100644 --- a/Src/Common/coretools.h +++ b/Src/Common/coretools.h @@ -119,7 +119,7 @@ DWORD FPUTS(LPCTSTR s, HANDLE hf); HANDLE FOPEN(LPCTSTR path, DWORD mode = GENERIC_READ, DWORD access = OPEN_EXISTING); CString ConvertPath2PS(LPCSTR szPath); void GetLocalDrives(LPTSTR letters); -BOOL GetIP(LPTSTR straddr); +//BOOL GetIP(LPTSTR straddr); void replace_char(LPTSTR s, int target, int repl); BOOL FileExtMatches(LPCTSTR filename, LPCTSTR ext); void SplitFilename(LPCTSTR s, CString * path, CString * name, CString * ext); diff --git a/Src/readme.txt b/Src/readme.txt index 9ad8a9419..72c4eb83c 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,7 +1,3 @@ -2003-10-30 Kimmo - Compare filename extensions as lowercase (before calling external editor) - WinMerge: MainFrm.cpp - 2003-10-30 Laoran BUG: [ 830911 ] trailing whitespaces not ignored WinMerge: UTIL.C @@ -12,6 +8,10 @@ 2003-10-30 Kimmo Remove SillyTestCrap() from Merge.cpp WinMerge: Merge.cpp + Compare filename extensions as lowercase (before calling external editor) + WinMerge: MainFrm.cpp + Comment out GetIP() to fix compiling by including coretools.h + common: coretools.h coretools.cpp 2003-10-29 Laoran change events PHYSICAL_PREPROCESS and SYNTAX_PREPROCESS to PREDIFFING -- 2.11.0