sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixed build on Ubuntu.

Browse Source 
This was SVN commit r5584.
This commit is contained in:
Matei 2008-01-26 04:43:02 +00:00
parent da5c66e7c5
commit 0201229520
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/lib/sysdep/linux/dir_watch_fam.cpp
View File

@ -109,8 +109,7 @@ LibError dir_get_changed_file(char* fn)
char n_path[PATH_MAX];
const char* dir = dirs[e.fr.reqnum].c_str();
snprintf(n_path, PATH_MAX, "%s%c%s", dir, SYS_DIR_SEP, e.filename);
RETURN_ERR(file_make_portable_path(n_path, fn));
return INFO::OK;
return ERR::AGAIN;
}
}
}

6
source/lib/sysdep/linux/ldbg.cpp
View File

@ -254,7 +254,6 @@ static void find_address_in_section (bfd *abfd, asection *section, void *data)
}
// BFD functions perform allocs with real malloc - we need to free that data
#include "lib/nommgr.h"
void demangle_buf(char *buf, const char *symbol, size_t n)
{
int status=0;
@ -374,3 +373,8 @@ LibError debug_resolve_symbol(void* ptr_of_interest, char* sym_name, char* file,
return INFO::OK;
}
void debug_set_thread_name(char const* UNUSED(name))
{
// Currently unimplemented
}

2
source/lib/sysdep/unix/udbg.cpp
View File

@ -100,7 +100,7 @@ void debug_heap_check()
// if <full_monty> is true or PARANOIA #defined, all possible checks are
// performed as often as possible. this is really slow (we are talking x100),
// but reports errors closer to where they occurred.
void debug_heap_enable(DebugHeapChecks UNUSED(what))
void debug_heap_enable(int UNUSED(heapChecks))
{
// No-op until we find out if glibc has heap debugging
}

2
source/lib/timer.cpp
View File

@ -197,7 +197,7 @@ std::string TimerUnit::ToString() const
// determine scale factor for pretty display
double scale = 1.0;
const char* unit = " c";
if(m_ticks > 10000000000) // 10 Gc
if(m_ticks > 10000000000LL) // 10 Gc
scale = 1e-9, unit = " Gc";
else if(m_ticks > 10000000) // 10 Mc
scale = 1e-6, unit = " Mc";