diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
| commit | b590992f735393c97489fce191e7810eaae4f6d7 (patch) | |
| tree | 286595c4aa43dbf3d616d816e5fade6ac364771a /src/libstrongswan/utils/backtrace.h | |
| parent | 2fce29055b7b5bc2860d503d1ae822931f80b7aa (diff) | |
| parent | 0a9d51a49042a68daa15b0c74a2b7f152f52606b (diff) | |
| download | vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.tar.gz vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.zip | |
Merge upstream version 4.5.2
Diffstat (limited to 'src/libstrongswan/utils/backtrace.h')
| -rw-r--r-- | src/libstrongswan/utils/backtrace.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/libstrongswan/utils/backtrace.h b/src/libstrongswan/utils/backtrace.h index 712122afb..e8ccfc1bd 100644 --- a/src/libstrongswan/utils/backtrace.h +++ b/src/libstrongswan/utils/backtrace.h @@ -41,14 +41,6 @@ struct backtrace_t { void (*log)(backtrace_t *this, FILE *file, bool detailed); /** -<<<<<<< HEAD - * Check if the backtrace contains a frame in a specific function. - * - * @param function name - * @return TRUE if function is in the stack - */ - bool (*contains_function)(backtrace_t *this, char *function); -======= * Check if the backtrace contains a frame having a function in a list. * * @param function name array @@ -56,7 +48,6 @@ struct backtrace_t { * @return TRUE if one of the functions is in the stack */ bool (*contains_function)(backtrace_t *this, char *function[], int count); ->>>>>>> upstream/4.5.1 /** * Destroy a backtrace instance. |