Add -Wshadow cflag and eliminate its warnings, including with g++

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 75af05c88a70e753b2bfdd5e32669e279c6b7c0b..c154d991549294e47eb67063d979d3135a41320a 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1459,13 +1459,13 @@ client_state_t;
 //
 // cvars
 //
-extern cvar_t name;
+extern cvar_t cl_name;
 extern cvar_t cl_color;
-extern cvar_t rate;
-extern cvar_t rate_burstsize;
-extern cvar_t pmodel;
-extern cvar_t playermodel;
-extern cvar_t playerskin;
+extern cvar_t cl_rate;
+extern cvar_t cl_rate_burstsize;
+extern cvar_t cl_pmodel;
+extern cvar_t cl_playermodel;
+extern cvar_t cl_playerskin;
 
 extern cvar_t rcon_password;
 extern cvar_t rcon_address;