Skip to content

Commit d27a16d

Browse files
committed
Removed more warnings
1 parent 571d3ae commit d27a16d

File tree

7 files changed

+20
-3
lines changed

7 files changed

+20
-3
lines changed

MUSHclient.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,9 @@ BOOL CMUSHclientApp::InitInstance()
468468

469469
// Standard initialization
470470

471+
#if _MSC_VER == 1200
471472
Enable3dControls();
473+
#endif
472474

473475
//Make sure this is here so you can use XP Styles
474476
InitCommonControls();

Utilities.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ char * pOut;
8686
*pOut++ = '\\';
8787
*pOut++ = 'x';
8888
char buf [20];
89-
itoa ((unsigned char) *p, buf, 16);
89+
_itoa ((unsigned char) *p, buf, 16);
9090
if (buf [1] == 0) // add leading zero
9191
*pOut++ = '0';
9292
*pOut++ = buf [0];

dialogs/world_prefs/TreePropertySheet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ void CTreePropertySheet::AddPaneSpace(int nWidth, int nTopPane,int nBottomPane)
846846
::GetClassName( pWndChild->GetSafeHwnd(),
847847
szClass,256);
848848

849-
if(stricmp(szClass,"Button")==0) {
849+
if(_stricmp(szClass,"Button")==0) {
850850
CRect rcButton;
851851

852852
pWndChild->GetClientRect(&rcButton);

scripting/scriptengine.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,9 @@ bool CScriptEngine::CreateScriptEngine (void)
294294
295295
*/
296296

297+
// avoid warning with more modern compiler
298+
#define _CRT_NON_CONFORMING_SWPRINTFS 1
299+
297300
// CString strFixedLanguage = m_strLanguage;
298301
//
299302
// strFixedLanguage.MakeLower ();

zlib/gzlib.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#define open _open // POSIX compliance
2+
#define read _read // "
3+
#define write _write // "
4+
#define close _close // "
5+
16
/* gzlib.c -- zlib functions common to reading and writing gzip files
27
* Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
38
* For conditions of distribution and use, see copyright notice in zlib.h

zlib/readme.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,11 @@ add:
5050
#pragma warning( disable : 4131) // uses old-style declarator
5151
#pragma warning( disable : 4244) // conversion from 'int' to 'unsigned short', possible loss of data
5252
#pragma warning( disable : 4702) // unreachable code
53+
54+
55+
5. Edit gzlib.c and at the start add the lines:
56+
57+
#define open _open // POSIX compliance
58+
#define read _read // "
59+
#define write _write // "
60+
#define close _close // "

zlib/zlib.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#pragma warning( disable : 4244) // conversion from 'int' to 'unsigned short', possible loss of data
55
#pragma warning( disable : 4702) // unreachable code
66

7-
87
/* zlib.h -- interface of the 'zlib' general purpose compression library
98
version 1.2.8, April 28th, 2013
109

0 commit comments

Comments
 (0)