summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-02-02 02:01:13 -0500
committerkwolekr <kwolekr@minetest.net>2015-02-02 02:01:13 -0500
commit0118c111e8f12602b03cee8deb4c86f9b9e28cf3 (patch)
treee159f2199eb6af32e6beb7c62ce7c9001147ff27 /src
parent43f102271dd3dc64b167ee305be5061976bd41d6 (diff)
downloadminetest-0118c111e8f12602b03cee8deb4c86f9b9e28cf3.tar.gz
minetest-0118c111e8f12602b03cee8deb4c86f9b9e28cf3.tar.bz2
minetest-0118c111e8f12602b03cee8deb4c86f9b9e28cf3.zip
Fix some MSVC-specific warnings and add debug path as an MSVC directory
Diffstat (limited to 'src')
-rw-r--r--[-rwxr-xr-x]src/jthread/win32/jsemaphore.cpp14
-rw-r--r--src/mods.cpp2
-rw-r--r--src/porting.cpp6
3 files changed, 12 insertions, 10 deletions
diff --git a/src/jthread/win32/jsemaphore.cpp b/src/jthread/win32/jsemaphore.cpp
index 40623b13d..27a11e819 100755..100644
--- a/src/jthread/win32/jsemaphore.cpp
+++ b/src/jthread/win32/jsemaphore.cpp
@@ -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;
}
diff --git a/src/mods.cpp b/src/mods.cpp
index 7d6b4f5f7..6126de7a1 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -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.
diff --git a/src/porting.cpp b/src/porting.cpp
index 584d2e2a2..e99d08426 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -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) != "");
}