BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

master #7

Merged
BRNSystems merged 95 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-28 00:16:42 +01:00
Conversation 0 Commits 95 Files Changed 224 +9 -17
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6f494a968d - Show all commits

6
src/gettext.cpp
View File

@ -20,15 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <string> #include <string>
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include <cstdlib>
#include "gettext.h" #include "gettext.h"
#include "util/string.h" #include "util/string.h"
#include "porting.h"
#include "log.h" #include "log.h"
#ifdef _WIN32
#define setenv(n,v,o) _putenv_s(n,v)
#endif
#if USE_GETTEXT && defined(_MSC_VER) #if USE_GETTEXT && defined(_MSC_VER)
#include <windows.h> #include <windows.h>
#include <map> #include <map>

12
src/porting.h
View File

@ -23,6 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#if (defined(__linux__) || defined(__GNU__)) && !defined(_GNU_SOURCE)
#define _GNU_SOURCE
#endif
#include <string> #include <string>
#include <vector> #include <vector>
#include "irrlicht.h" #include "irrlicht.h"
@ -43,12 +47,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define sleep_ms(x) Sleep(x) #define sleep_ms(x) Sleep(x)
#define sleep_us(x) Sleep((x)/1000) #define sleep_us(x) Sleep((x)/1000)
#define setenv(n,v,o) _putenv_s(n,v)
#define unsetenv(n) _putenv_s(n,"")
#else #else
#include <unistd.h> #include <unistd.h>
#include <cstdlib> // setenv
#if (defined(__linux__) || defined(__GNU__)) && !defined(_GNU_SOURCE)
#define _GNU_SOURCE
#endif
#define sleep_ms(x) usleep((x)*1000) #define sleep_ms(x) usleep((x)*1000)
#define sleep_us(x) usleep(x) #define sleep_us(x) usleep(x)

8
src/unittest/test_servermodmanager.cpp
View File

@ -67,15 +67,7 @@ void TestServerModManager::runTests(IGameDef *gamedef)
ofs2 << "-- intentionally empty\n"; ofs2 << "-- intentionally empty\n";
} }
#ifdef WIN32
{
std::string mod_path("MINETEST_MOD_PATH=");
mod_path.append(test_mods);
_putenv(mod_path.c_str());
}
#else
setenv("MINETEST_MOD_PATH", test_mods.c_str(), 1); setenv("MINETEST_MOD_PATH", test_mods.c_str(), 1);
#endif
m_worlddir = getTestTempDirectory().append(DIR_DELIM "world"); m_worlddir = getTestTempDirectory().append(DIR_DELIM "world");
fs::CreateDir(m_worlddir); fs::CreateDir(m_worlddir);