Merge changes from the witness.

2011-09-27 17:48:46 +00:00
parent 9c0658edca
commit 3c0ab2d3f3
47 changed files with 1811 additions and 186 deletions
--- a/src/nvcore/DefsGnucDarwin.h
+++ b/src/nvcore/DefsGnucDarwin.h
@ -2,7 +2,7 @@
 #error "Do not include this file directly."
 #endif

-//#include <stdint.h> // uint8_t, int8_t, ...
+#include <stdint.h> // uint8_t, int8_t, ... uintptr_t
 #include <cstddef> // operator new, size_t, NULL

 // Function linkage
@ -67,4 +67,4 @@ typedef int64_t     int64;

 // Aliases
 typedef uint32      uint;
-*/
+*/