1
0
forked from 0ad/0ad

# housekeeping

. add note to HAVE_C99 as per last meeting.
. moved a few extern declarations to header (required for some code
analysis tools)
. tiny warning fix in SoundGroup

This was SVN commit r4772.
This commit is contained in:
janwas 2007-01-14 23:13:08 +00:00
parent 3f017c418c
commit 94099e035a
6 changed files with 15 additions and 8 deletions

View File

@ -285,6 +285,14 @@
// compiler support for C99
// (this is more convenient than testing __STDC_VERSION__ directly)
// note: we currently lie about __STDC_VERSION__ via premake on
// MacOS X to enable support for some C99 functions. unfortunately this
// causes the OS X system headers to use the restrict keyword, which
// gcc doesn't actually support there.
// TODO: we therefore need to get rid of HAVE_C99, since we're using C++,
// which is not C99. some useful features from C99 - e.g. stdint and
// restrict - will surely be added to C++; we should test for their
// existence and not all of C99.
#define HAVE_C99 0
#ifdef __STDC_VERSION__
# if __STDC_VERSION__ >= 199901L

View File

@ -577,6 +577,8 @@ extern LibError debug_resolve_symbol(void* ptr_of_interest, char* sym_name, char
**/
extern LibError debug_dump_stack(wchar_t* buf, size_t max_chars, uint skip, void* context);
extern const char* debug_get_symbol_string(void* symbol, const char* name, const char* file, int line);
//-----------------------------------------------------------------------------
// helper functions (used by implementation)

View File

@ -130,8 +130,6 @@ uint mmgr_set_options(uint new_options)
// string formatting routines for log and reports
//////////////////////////////////////////////////////////////////////////////
extern const char* debug_get_symbol_string(void* symbol, const char* name, const char* file, int line);
const size_t NUM_SIZE = 32;
// enough to cover even 64 bit numbers

View File

@ -34,6 +34,8 @@
#include "lib/sysdep/cpu.h"
#include "win_internal.h"
#include "wdbg_sym.h"
#pragma SECTION_PRE_LIBC(D)
WIN_REGISTER_FUNC(wdbg_init);
@ -660,9 +662,6 @@ static void get_exception_locus(const EXCEPTION_POINTERS* ep,
// - a new fat exception class would have to be created to hold the
// SEH exception information (e.g. CONTEXT for a stack trace), and
// - this information would not be available for C++ exceptions.
extern void wdbg_write_minidump(EXCEPTION_POINTERS* ep);
LONG WINAPI wdbg_exception_filter(EXCEPTION_POINTERS* ep)
{
// note: we risk infinite recursion if someone raises an SEH exception
@ -687,7 +686,7 @@ LONG WINAPI wdbg_exception_filter(EXCEPTION_POINTERS* ep)
// this must happen before the error dialog because user could choose to
// exit immediately there.
wdbg_write_minidump(ep);
wdbg_sym_write_minidump(ep);
wchar_t buf[500];
const wchar_t* msg_fmt =

View File

@ -1896,7 +1896,7 @@ LibError debug_dump_stack(wchar_t* buf, size_t max_chars, uint skip, void* pcont
// examining the crash in a debugger. called by wdbg_exception_filter.
// heavily modified from http://www.codeproject.com/debug/XCrashReportPt3.asp
// lock must be held.
void wdbg_write_minidump(EXCEPTION_POINTERS* exception_pointers)
void wdbg_sym_write_minidump(EXCEPTION_POINTERS* exception_pointers)
{
lock();

View File

@ -89,7 +89,7 @@ void CSoundGroup::PlayNext()
{
// try loading on the fly only when we need the sound to see if that fixes release problems...
if(TestFlag(eRandOrder))
m_index = (size_t)rand(0, filenames.size());
m_index = (size_t)rand(0, (uint)filenames.size());
Handle temp;
temp = snd_open(m_filepath + filenames[m_index]);
snd_set_gain(temp, m_Gain);