From a866ade2d72cfe4f466fdb25fda3ccb31756bebc Mon Sep 17 00:00:00 2001 From: olsner Date: Sat, 18 Jul 2009 01:58:16 +0000 Subject: [PATCH] OS X compile fixes This was SVN commit r7015. --- source/lib/secure_crt.h | 2 +- source/lib/sysdep/os/osx/odbg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/lib/secure_crt.h b/source/lib/secure_crt.h index 46daf1a477..677714ff5f 100644 --- a/source/lib/secure_crt.h +++ b/source/lib/secure_crt.h @@ -38,7 +38,7 @@ namespace ERR #if EMULATE_SECURE_CRT // (conflicts with glibc definitions) -#if !OS_UNIX +#if !OS_UNIX || OS_MACOSX // return length [in characters] of a string, not including the trailing // null character. to protect against access violations, only the // first characters are examined; if the null character is diff --git a/source/lib/sysdep/os/osx/odbg.cpp b/source/lib/sysdep/os/osx/odbg.cpp index 6f06d58c96..016b3c38d9 100644 --- a/source/lib/sysdep/os/osx/odbg.cpp +++ b/source/lib/sysdep/os/osx/odbg.cpp @@ -28,7 +28,7 @@ void* debug_GetCaller(void* UNUSED(context), const char* UNUSED(lastFuncToSkip)) return NULL; } -LibError debug_DumpStack(wchar_t* UNUSED(buf), size_t UNUSED(max_chars), size_t UNUSED(skip), void* UNUSED(context)) +LibError debug_DumpStack(wchar_t* UNUSED(buf), size_t UNUSED(max_chars), void* UNUSED(context), const char* UNUSED(lastFuncToSkip)) { return ERR::NOT_IMPLEMENTED; }