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 +5 -15
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 225aa107f6 - Show all commits

2
src/CMakeLists.txt
View File

@ -695,6 +695,8 @@ endif()
include(CheckCSourceCompiles) include(CheckCSourceCompiles)
include(CheckSymbolExists) include(CheckSymbolExists)
check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR})
if(USE_LUAJIT) if(USE_LUAJIT)
set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARY}) set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARY})

1
src/cmake_config.h.in
View File

@ -30,6 +30,7 @@
#cmakedefine01 USE_SYSTEM_JSONCPP #cmakedefine01 USE_SYSTEM_JSONCPP
#cmakedefine01 USE_REDIS #cmakedefine01 USE_REDIS
#cmakedefine01 HAVE_ENDIAN_H #cmakedefine01 HAVE_ENDIAN_H
#cmakedefine01 HAVE_STRLCPY
#cmakedefine01 CURSES_HAVE_CURSES_H #cmakedefine01 CURSES_HAVE_CURSES_H
#cmakedefine01 CURSES_HAVE_NCURSES_H #cmakedefine01 CURSES_HAVE_NCURSES_H
#cmakedefine01 CURSES_HAVE_NCURSES_NCURSES_H #cmakedefine01 CURSES_HAVE_NCURSES_NCURSES_H

17
src/porting.h
View File

@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// Be mindful of what you include here! // Be mindful of what you include here!
#include <string> #include <string>
#include "config.h"
#include "irrlichttypes.h" // u64 #include "irrlichttypes.h" // u64
#include "debug.h" #include "debug.h"
#include "constants.h" #include "constants.h"
@ -70,21 +71,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define strtok_r(x, y, z) mystrtok_r(x, y, z) #define strtok_r(x, y, z) mystrtok_r(x, y, z)
#endif #endif
// strlcpy is missing from glibc. thanks a lot, drepper. #if !HAVE_STRLCPY
// strlcpy is also missing from AIX and HP-UX because they aim to be weird.
// We can't simply alias strlcpy to MSVC's strcpy_s, since strcpy_s by
// default raises an assertion error and aborts the program if the buffer is
// too small.
#if defined(__FreeBSD__) || defined(__NetBSD__) || \
defined(__OpenBSD__) || defined(__DragonFly__) || \
defined(__APPLE__) || \
defined(__sun) || defined(sun) || \
defined(__QNX__) || defined(__QNXNTO__)
#define HAVE_STRLCPY
#endif
// So we need to define our own.
#ifndef HAVE_STRLCPY
#define strlcpy(d, s, n) mystrlcpy(d, s, n) #define strlcpy(d, s, n) mystrlcpy(d, s, n)
#endif #endif