diff --git a/cutils.h b/cutils.h
index f2eb44402..50fee11a1 100644
--- a/cutils.h
+++ b/cutils.h
@@ -98,7 +98,7 @@ extern "C" {
 #define container_of(ptr, type, member) ((type *)((uint8_t *)(ptr) - offsetof(type, member)))
 #endif
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__cplusplus)
 #define minimum_length(n) n
 #else
 #define minimum_length(n) static n