From 5868133587985ef8ce59c8917df2dc2f0eb17dc7 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 23 Dec 2016 10:34:47 -0800 Subject: [PATCH] libobs/util: Fix C++ compilation issue When the C header circlebuf.h is used from a C++ source file, this implicit cast from void to uint8_t* will cause an error unless changed to an explicit cast. --- libobs/util/circlebuf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libobs/util/circlebuf.h b/libobs/util/circlebuf.h index 5c534b914..111f17adb 100644 --- a/libobs/util/circlebuf.h +++ b/libobs/util/circlebuf.h @@ -256,7 +256,7 @@ static inline void circlebuf_pop_back(struct circlebuf *cb, void *data, static inline void *circlebuf_data(struct circlebuf *cb, size_t idx) { - uint8_t *ptr = cb->data; + uint8_t *ptr = (uint8_t*)cb->data; size_t offset = cb->start_pos + idx; if (idx > cb->size)