minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix some MSVC-specific warnings and add debug path as an MSVC directory

This commit is contained in:
kwolekr 2015-02-02 02:01:13 -05:00
parent 43f102271d
commit 0118c111e8
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jthread/win32/jsemaphore.cpp Executable file → Normal file
View File

@ -81,9 +81,9 @@ typedef struct _SEMAPHORE_BASIC_INFORMATION {
/* Note: this will only work as long as jthread is directly linked to application */ /* Note: this will only work as long as jthread is directly linked to application */
/* it's gonna fail if someone tries to build jthread as dll */ /* it's gonna fail if someone tries to build jthread as dll */
static _NtQuerySemaphore NtQuerySemaphore = static _NtQuerySemaphore NtQuerySemaphore =
(_NtQuerySemaphore) (_NtQuerySemaphore)
GetProcAddress GetProcAddress
(GetModuleHandle ("ntdll.dll"), "NtQuerySemaphore"); (GetModuleHandle ("ntdll.dll"), "NtQuerySemaphore");
int JSemaphore::GetValue() { int JSemaphore::GetValue() {
@ -91,16 +91,14 @@ int JSemaphore::GetValue() {
LONG retval; LONG retval;
assert(NtQuerySemaphore); assert(NtQuerySemaphore);
retval = NtQuerySemaphore (m_hSemaphore, 0, retval = NtQuerySemaphore (m_hSemaphore, 0,
&BasicInfo, sizeof (SEMAPHORE_BASIC_INFORMATION), NULL); &BasicInfo, sizeof (SEMAPHORE_BASIC_INFORMATION), NULL);
if (retval == ERROR_SUCCESS) if (retval == ERROR_SUCCESS)
{
return BasicInfo.CurrentCount; return BasicInfo.CurrentCount;
}
else { assert("unable to read semaphore count" == 0);
assert("unable to read semaphore count" == 0); return 0;
}
} }

2
src/mods.cpp
View File

@ -240,7 +240,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods)
for(std::vector<ModSpec>::const_iterator it = new_mods.begin(); for(std::vector<ModSpec>::const_iterator it = new_mods.begin();
it != new_mods.end(); ++it){ it != new_mods.end(); ++it){
const ModSpec &mod = *it; const ModSpec &mod = *it;
if(mod.part_of_modpack != want_from_modpack) if(mod.part_of_modpack != (bool)want_from_modpack)
continue; continue;
if(existing_mods.count(mod.name) == 0){ if(existing_mods.count(mod.name) == 0){
// GOOD CASE: completely new mod. // GOOD CASE: completely new mod.

6
src/porting.cpp
View File

@ -290,7 +290,11 @@ void pathRemoveFile(char *path, char delim)
bool detectMSVCBuildDir(char *c_path) bool detectMSVCBuildDir(char *c_path)
{ {
std::string path(c_path); std::string path(c_path);
const char *ends[] = {"bin\\Release", "bin\\Build", NULL}; const char *ends[] = {
"bin\\Release",
"bin\\Debug",
"bin\\Build",
NULL};
return (removeStringEnd(path, ends) != ""); return (removeStringEnd(path, ends) != "");
} }