almost done with the namespace protection via -D__V3VEE__ header wrappers

[palacios.git] / palacios / include / palacios / vmm_types.h

diff --git a/palacios/include/palacios/vmm_types.h b/palacios/include/palacios/vmm_types.h
index fbc9743..cb846f2 100644 (file)
--- a/palacios/include/palacios/vmm_types.h
+++ b/palacios/include/palacios/vmm_types.h
@@ -1,9 +1,13 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 #ifndef __VMM_TYPES_H
 #define __VMM_TYPES_H
 
-#include <geekos/ktypes.h>
+#ifdef __V3VEE__
+//#include <geekos/ktypes.h>
+
 
-/*
 typedef signed char schar_t;
 typedef unsigned char uchar_t;
 
@@ -21,7 +25,8 @@ typedef unsigned long ulong_t;
 
 typedef unsigned long size_t;
 
-*/
+
+
 
 
 
@@ -31,4 +36,8 @@ typedef long long sint64_t;
 typedef unsigned int uint32_t;
 typedef int sint32_t;
 
+typedef ulong_t addr_t;
+
+#endif // ! __V3VEE__
+
 #endif