Skip to content

Commit

Permalink
Removed more warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nickgammon committed Jan 7, 2017
1 parent 571d3ae commit d27a16d
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 3 deletions.
2 changes: 2 additions & 0 deletions MUSHclient.cpp
Expand Up @@ -468,7 +468,9 @@ BOOL CMUSHclientApp::InitInstance()

// Standard initialization

#if _MSC_VER == 1200
Enable3dControls();
#endif

//Make sure this is here so you can use XP Styles
InitCommonControls();
Expand Down
2 changes: 1 addition & 1 deletion Utilities.cpp
Expand Up @@ -86,7 +86,7 @@ char * pOut;
*pOut++ = '\\';
*pOut++ = 'x';
char buf [20];
itoa ((unsigned char) *p, buf, 16);
_itoa ((unsigned char) *p, buf, 16);
if (buf [1] == 0) // add leading zero
*pOut++ = '0';
*pOut++ = buf [0];
Expand Down
2 changes: 1 addition & 1 deletion dialogs/world_prefs/TreePropertySheet.cpp
Expand Up @@ -846,7 +846,7 @@ void CTreePropertySheet::AddPaneSpace(int nWidth, int nTopPane,int nBottomPane)
::GetClassName( pWndChild->GetSafeHwnd(),
szClass,256);

if(stricmp(szClass,"Button")==0) {
if(_stricmp(szClass,"Button")==0) {
CRect rcButton;

pWndChild->GetClientRect(&rcButton);
Expand Down
3 changes: 3 additions & 0 deletions scripting/scriptengine.cpp
Expand Up @@ -294,6 +294,9 @@ bool CScriptEngine::CreateScriptEngine (void)
*/

// avoid warning with more modern compiler
#define _CRT_NON_CONFORMING_SWPRINTFS 1

// CString strFixedLanguage = m_strLanguage;
//
// strFixedLanguage.MakeLower ();
Expand Down
5 changes: 5 additions & 0 deletions zlib/gzlib.c
@@ -1,3 +1,8 @@
#define open _open // POSIX compliance
#define read _read // "
#define write _write // "
#define close _close // "

/* gzlib.c -- zlib functions common to reading and writing gzip files
* Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
Expand Down
8 changes: 8 additions & 0 deletions zlib/readme.txt
Expand Up @@ -50,3 +50,11 @@ add:
#pragma warning( disable : 4131) // uses old-style declarator
#pragma warning( disable : 4244) // conversion from 'int' to 'unsigned short', possible loss of data
#pragma warning( disable : 4702) // unreachable code


5. Edit gzlib.c and at the start add the lines:

#define open _open // POSIX compliance
#define read _read // "
#define write _write // "
#define close _close // "
1 change: 0 additions & 1 deletion zlib/zlib.h
Expand Up @@ -4,7 +4,6 @@
#pragma warning( disable : 4244) // conversion from 'int' to 'unsigned short', possible loss of data
#pragma warning( disable : 4702) // unreachable code


/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.8, April 28th, 2013
Expand Down

0 comments on commit d27a16d

Please sign in to comment.