Browse Source

Merge branch 'master' into cmake

rdb 12 years ago
parent
commit
3fa270b302
2 changed files with 2 additions and 0 deletions
  1. 1 0
      panda/src/express/memoryUsage.cxx
  2. 1 0
      panda/src/express/subStreamBuf.cxx

+ 1 - 0
panda/src/express/memoryUsage.cxx

@@ -27,6 +27,7 @@
 #endif
 
 #include "config_express.h"
+#include "configVariableInt64.h"
 #include <algorithm>
 #include <iterator>
 

+ 1 - 0
panda/src/express/subStreamBuf.cxx

@@ -14,6 +14,7 @@
 
 #include "subStreamBuf.h"
 #include "pnotify.h"
+#include "memoryHook.h"
 
 #ifndef HAVE_STREAMSIZE
 // Some compilers (notably SGI) don't define this for us