After-merge fix of the Windows build
This commit is contained in:
parent
d5d8756de3
commit
65c43bcfe2
@ -42,19 +42,21 @@
|
|||||||
C_MODE_START
|
C_MODE_START
|
||||||
|
|
||||||
#if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)
|
#if defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)
|
||||||
void my_setup_stacktrace(void);
|
|
||||||
void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack,
|
void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack,
|
||||||
my_bool silent);
|
my_bool silent);
|
||||||
int my_safe_print_str(const char* val, size_t max_len);
|
int my_safe_print_str(const char* val, size_t max_len);
|
||||||
void my_write_core(int sig);
|
void my_write_core(int sig);
|
||||||
#if BACKTRACE_DEMANGLE
|
# if BACKTRACE_DEMANGLE
|
||||||
char *my_demangle(const char *mangled_name, int *status);
|
char *my_demangle(const char *mangled_name, int *status);
|
||||||
#endif /* BACKTRACE_DEMANGLE */
|
# endif /* BACKTRACE_DEMANGLE */
|
||||||
#ifdef __WIN__
|
# ifdef __WIN__
|
||||||
|
# define my_setup_stacktrace()
|
||||||
void my_set_exception_pointers(EXCEPTION_POINTERS *ep);
|
void my_set_exception_pointers(EXCEPTION_POINTERS *ep);
|
||||||
#endif /* __WIN__ */
|
# else
|
||||||
|
void my_setup_stacktrace(void);
|
||||||
|
# endif /* __WIN__ */
|
||||||
#else
|
#else
|
||||||
#define my_setup_stacktrace()
|
# define my_setup_stacktrace()
|
||||||
#endif /* ! (defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)) */
|
#endif /* ! (defined(HAVE_STACKTRACE) || defined(HAVE_BACKTRACE)) */
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user