Merged from upstream, fixed 'args' name colission

This commit is contained in:
Zachary Pierson
2017-04-06 18:14:42 -05:00
parent c0019cc305
commit 6b33b254e9
4 changed files with 206 additions and 2 deletions
+3 -1
View File
@@ -276,7 +276,9 @@ extern "C" {
// TODO(bill): How many of these headers do I really need?
// #include <stdarg.h>
// #include <stddef.h>
#if !defined(GB_SYSTEM_WINDOWS)
#include <stddef.h>
#endif