forked from Mirrorlandia_minetest/minetest
Fix some MSVC-specific warnings and add debug path as an MSVC directory
This commit is contained in:
parent
43f102271d
commit
0118c111e8
14
src/jthread/win32/jsemaphore.cpp
Executable file → Normal file
14
src/jthread/win32/jsemaphore.cpp
Executable file → Normal file
@ -81,9 +81,9 @@ typedef struct _SEMAPHORE_BASIC_INFORMATION {
|
||||
|
||||
/* 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 */
|
||||
static _NtQuerySemaphore NtQuerySemaphore =
|
||||
static _NtQuerySemaphore NtQuerySemaphore =
|
||||
(_NtQuerySemaphore)
|
||||
GetProcAddress
|
||||
GetProcAddress
|
||||
(GetModuleHandle ("ntdll.dll"), "NtQuerySemaphore");
|
||||
|
||||
int JSemaphore::GetValue() {
|
||||
@ -91,16 +91,14 @@ int JSemaphore::GetValue() {
|
||||
LONG retval;
|
||||
|
||||
assert(NtQuerySemaphore);
|
||||
|
||||
|
||||
retval = NtQuerySemaphore (m_hSemaphore, 0,
|
||||
&BasicInfo, sizeof (SEMAPHORE_BASIC_INFORMATION), NULL);
|
||||
|
||||
if (retval == ERROR_SUCCESS)
|
||||
{
|
||||
return BasicInfo.CurrentCount;
|
||||
}
|
||||
else {
|
||||
assert("unable to read semaphore count" == 0);
|
||||
}
|
||||
|
||||
assert("unable to read semaphore count" == 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -240,7 +240,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods)
|
||||
for(std::vector<ModSpec>::const_iterator it = new_mods.begin();
|
||||
it != new_mods.end(); ++it){
|
||||
const ModSpec &mod = *it;
|
||||
if(mod.part_of_modpack != want_from_modpack)
|
||||
if(mod.part_of_modpack != (bool)want_from_modpack)
|
||||
continue;
|
||||
if(existing_mods.count(mod.name) == 0){
|
||||
// GOOD CASE: completely new mod.
|
||||
|
@ -290,7 +290,11 @@ void pathRemoveFile(char *path, char delim)
|
||||
bool detectMSVCBuildDir(char *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) != "");
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user