cvar: Check if cvar is NULL before adding callback. Implement Cvar_Callback to fire...

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index d11b141cb9d92c491a42cf33dca9c65a910bbf42..24619a147bcdf61581a629d5ae8efec8aa681353 100644 (file)
--- a/common.h
+++ b/common.h
@@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef COMMON_H
 #define COMMON_H
 
+#include <stdarg.h>
+#include "qtypes.h"
+#include "qdefs.h"
 
 /// MSVC has a different name for several standard functions
 #ifdef WIN32
@@ -38,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //============================================================================
 
-#define ContainerOf(ptr, type, member) ((type *)((void *)&(ptr) - offsetof(type, member)))
+#define ContainerOf(ptr, type, member) ((type *)((char *)&(ptr) - offsetof(type, member)))
 
 typedef struct sizebuf_s
 {