Index: src/common/console/c_cvars.h
--- src/common/console/c_cvars.h.orig
+++ src/common/console/c_cvars.h
@@ -761,7 +761,7 @@ void C_ForgetCVars (void);
 
 #define CVARD_NAMED(type,name,cname,def,flags,descr) \
 	__CVAR_VALUE_DECLARATION(type,name) \
-	__CVAR_VALUE_DEFINITION(type,name,cname,def,flags,descr,NULL)
+	__CVAR_VALUE_DEFINITION(type,name,cname,def,flags,descr,(void*)nullptr)
 
 #define CUSTOM_CVARD_NAMED(type,name,cname,def,flags,descr) \
 	__CVAR_CALLBACK_DECLARATION(type,name) \
@@ -771,7 +771,7 @@ void C_ForgetCVars (void);
 
 #define DEPR_CVAR(type,name,def,reason) \
 	[[deprecated(reason)]] __CVAR_VALUE_DECLARATION(type,name) \
-	ALLOW_DEPRECATED(__CVAR_VALUE_DEFINITION(type,name,name,def,CVAR_HIDDEN,nullptr,NULL), "so we don't get a warning immediately")
+	ALLOW_DEPRECATED(__CVAR_VALUE_DEFINITION(type,name,name,def,CVAR_HIDDEN,nullptr,(void*)nullptr), "so we don't get a warning immediately")
 
 #define CUSTOM_CVAR_NAMED(type,name,cname,def,flags) CUSTOM_CVARD_NAMED(type,name,cname,def,flags,nullptr)
 #define CUSTOM_CVARD(type,name,def,flags,descr) CUSTOM_CVARD_NAMED(type,name,name,def,flags,descr)
