oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00
Code Wiki Activity

Merged some FreeBSD fixes

Browse source
This commit is contained in:
Perttu Ahola 2011-08-11 12:32:36 +03:00
commit 69fca4f3cb
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -173,7 +173,7 @@ include_directories(
${SQLITE3_INCLUDE_DIR}
)
set(EXECUTABLE_OUTPUT_PATH ../bin)
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
if(BUILD_CLIENT)
add_executable(${PROJECT_NAME} ${minetest_SRCS})

8
src/debug.cpp
View file

@ -68,9 +68,9 @@ Nullstream dummyout;
void assert_fail(const char *assertion, const char *file,
unsigned int line, const char *function)
{
DEBUGPRINT("\nIn thread %x:\n"
DEBUGPRINT("\nIn thread %lx:\n"
"%s:%d: %s: Assertion '%s' failed.\n",
(unsigned int)get_current_thread_id(),
(unsigned long)get_current_thread_id(),
file, line, function, assertion);
debug_stacks_print();
@ -95,8 +95,8 @@ DebugStack::DebugStack(threadid_t id)
void DebugStack::print(FILE *file, bool everything)
{
fprintf(file, "DEBUG STACK FOR THREAD %x:\n",
(unsigned int)threadid);
fprintf(file, "DEBUG STACK FOR THREAD %lx:\n",
(unsigned long)threadid);
for(int i=0; i<stack_max_i; i++)
{