diff options
| author | Gacko <gacko28@gmx.de> | 2017-05-20 11:59:40 +0200 |
|---|---|---|
| committer | Gacko <gacko28@gmx.de> | 2017-05-20 12:26:40 +0200 |
| commit | 2b48a84524f6b791af185b6a123fe3c148602469 (patch) | |
| tree | d075f1ee6cd482f183b6e9fbab92ca6f1f20e0c6 /dep/CascLib | |
| parent | d07fa64a156ec452cc14c462e8e51bf3d600197d (diff) | |
Apply ladislav-zezula/CascLib PR#73: Fix build on Mac/Linux.
https://github.com/ladislav-zezula/CascLib/pull/73
Diffstat (limited to 'dep/CascLib')
| -rw-r--r-- | dep/CascLib/src/CascRootFile_Diablo3.cpp | 2 | ||||
| -rw-r--r-- | dep/CascLib/src/CascRootFile_WoW6.cpp | 2 | ||||
| -rw-r--r-- | dep/CascLib/src/common/RootHandler.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dep/CascLib/src/CascRootFile_Diablo3.cpp b/dep/CascLib/src/CascRootFile_Diablo3.cpp index 129c9563a91..f695ad978b1 100644 --- a/dep/CascLib/src/CascRootFile_Diablo3.cpp +++ b/dep/CascLib/src/CascRootFile_Diablo3.cpp @@ -606,7 +606,7 @@ static void ResolveFullFileNames( char szFullName[MAX_PATH+1]; // Keep compiler happy - UNREFERENCED_PARAMETER(dwFileIndexes); + CASCLIB_UNUSED(dwFileIndexes); // Parse the entire file table for(size_t i = 0; i < pRootHandler->FileTable.ItemCount; i++) diff --git a/dep/CascLib/src/CascRootFile_WoW6.cpp b/dep/CascLib/src/CascRootFile_WoW6.cpp index 737fc0af6db..74805d07620 100644 --- a/dep/CascLib/src/CascRootFile_WoW6.cpp +++ b/dep/CascLib/src/CascRootFile_WoW6.cpp @@ -457,7 +457,7 @@ static DWORD WowHandler_GetFileId(TRootHandler_WoW6 * pRootHandler, const char * // Find by the file name hash pFileEntry = FindRootEntry(pRootHandler->pRootMap, szFileName, NULL); - return (pFileEntry != NULL) ? pFileEntry->FileDataId : NULL; + return (pFileEntry != NULL) ? pFileEntry->FileDataId : 0; } static void WowHandler_Close(TRootHandler_WoW6 * pRootHandler) diff --git a/dep/CascLib/src/common/RootHandler.cpp b/dep/CascLib/src/common/RootHandler.cpp index 2940e3f0cae..afdd869f599 100644 --- a/dep/CascLib/src/common/RootHandler.cpp +++ b/dep/CascLib/src/common/RootHandler.cpp @@ -81,7 +81,7 @@ DWORD RootHandler_GetFileId(TRootHandler * pRootHandler, const char * szFileName { // Check if the root structure is valid at all if(pRootHandler == NULL) - return NULL; + return 0; return pRootHandler->GetFileId(pRootHandler, szFileName); } |