Linux fixes
This was SVN commit r763.
This commit is contained in:
parent
e01f4a540d
commit
8684287360
@ -1,5 +1,5 @@
|
||||
/*
|
||||
$Id: unifont.cpp,v 1.8 2004/07/13 22:47:20 philip Exp $
|
||||
$Id: unifont.cpp,v 1.9 2004/07/15 19:58:12 philip Exp $
|
||||
|
||||
Unicode OpenGL texture font
|
||||
|
||||
@ -229,4 +229,4 @@ int unifont_stringsize(const Handle h, const char* text, int& width, int& height
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "sysdep.h"
|
||||
#include <memory.h>
|
||||
|
||||
// portable debug output routines. Win32 offers better versions, which
|
||||
// override these.
|
||||
@ -68,7 +69,7 @@ void debug_microlog(const wchar_t *fmt, ...)
|
||||
int count = 0;
|
||||
|
||||
va_start(argp, fmt);
|
||||
vsnwprintf(buffer, sizeof(buffer), fmt, argp);
|
||||
vswprintf(buffer, sizeof(buffer), fmt, argp);
|
||||
va_end(argp);
|
||||
|
||||
wcscat(buffer, L"\r\n");
|
||||
|
@ -96,3 +96,11 @@ int debug_assert_failed(const char *file, int line, const char *expr)
|
||||
}
|
||||
} while (false);
|
||||
}
|
||||
|
||||
int debug_write_crashlog(const char* file, wchar_t* header, void* context)
|
||||
{
|
||||
// TODO: Do this properly. (I don't know what I'm doing; I just
|
||||
// know that this function is required in order to compile...)
|
||||
|
||||
abort();
|
||||
}
|
||||
|
@ -15,4 +15,4 @@ public:
|
||||
|
||||
const wchar_t* GetErrorString(int code);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -7,7 +7,9 @@
|
||||
#endif
|
||||
|
||||
#ifdef OS_UNIX
|
||||
# define XP_UNIX
|
||||
# ifndef XP_UNIX
|
||||
# define XP_UNIX
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <jsapi.h>
|
||||
|
Loading…
Reference in New Issue
Block a user