Skip to content

Commit aa99100

Browse files
Prefix Jit to CallBack to avoid name conflicts
1 parent e63e186 commit aa99100

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

include/drjit-core/jit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ extern JIT_EXPORT JIT_ENUM LogLevel jit_log_level_stderr();
293293
* invoked with the contents of library log messages, whose severity matches or
294294
* exceeds the specified \c level.
295295
*/
296-
typedef void (*LogCallback)(JIT_ENUM LogLevel, const char *);
296+
typedef void (*JitLogCallback)(JIT_ENUM LogLevel, const char *);
297297
extern JIT_EXPORT void jit_set_log_level_callback(JIT_ENUM LogLevel level,
298-
LogCallback callback);
298+
JitLogCallback callback);
299299

300300
/// Return the currently set minimum log level for output to a callback
301301
extern JIT_EXPORT JIT_ENUM LogLevel jit_log_level_callback();

src/api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ LogLevel jit_log_level_stderr() {
116116
return state.log_level_stderr;
117117
}
118118

119-
void jit_set_log_level_callback(LogLevel level, LogCallback callback) {
119+
void jit_set_log_level_callback(LogLevel level, JitLogCallback callback) {
120120
lock_guard guard(state.lock);
121121
state.log_level_callback = callback ? level : Disable;
122122
state.log_callback = callback;

src/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ struct State {
834834
LogLevel log_level_callback = LogLevel::Disable;
835835

836836
/// Callback for log messages
837-
LogCallback log_callback = nullptr;
837+
JitLogCallback log_callback = nullptr;
838838

839839
/// Bit-mask of successfully initialized backends
840840
uint32_t backends = 0;

0 commit comments

Comments
 (0)