Changeset 13718

Timestamp:

10/31/08 15:40:19 (2 months ago)

Author:

vboxsync

Message:

includes: made them 'build' again.

Files:

• trunk/include/Makefile.kmk (modified) (1 diff)
• trunk/include/VBox/hwacc_vmx.h (modified) (2 diffs)
• trunk/include/VBox/selm.h (modified) (1 diff)
• trunk/include/iprt/autores.h (modified) (2 diffs)
• trunk/include/iprt/mem.h (modified) (1 diff)

trunk/include/Makefile.kmk

@@ -39 +39 @@
-        VBox/VBoxHDD.h \
-        iprt/tcp.h \
+        iprt/localipc.h
-
-hdrs := $(filter-out \
-        VBox/VBoxGuest16.h \
-        VBox/tapwin32.h \
-
+
+
-        $(wildcard VBox/*.h iprt/*.h))
-

trunk/include/VBox/hwacc_vmx.h

@@ -35 +35 @@
-#include <iprt/assert.h>
-#include <iprt/asm.h>
+#include <VBox/x86.h>
-
-/** @defgroup grp_vmx   vmx Types and Definitions
@@ -52 +53 @@
-/**
- * EPT Page Directory Pointer Entry. Bit view.
+ * @todo uint64_t isn't safe for bitfields (gcc pedantic warnings, and IIRC,
+ *       this did cause trouble with one compiler/version).
- */
-#pragma pack(1)

trunk/include/VBox/selm.h

@@ -79 +79 @@
-
-VMMDECL(int)        SELMToFlatEx(PVM pVM, DIS_SELREG SelReg, PCCPUMCTXCORE pCtxCore, RTGCPTR Addr, unsigned fFlags, PRTGCPTR ppvGC);
-CPUMSELREGHID *
+PCPUMSELREGHID 
-VMMDECL(int)        SELMValidateAndConvertCSAddr(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, PCPUMSELREGHID pHiddenCSSel, RTGCPTR Addr, PRTGCPTR ppvFlat);
-VMMDECL(int)        SELMValidateAndConvertCSAddrGCTrap(PVM pVM, X86EFLAGS eflags, RTSEL SelCPL, RTSEL SelCS, RTGCPTR Addr, PRTGCPTR ppvFlat, uint32_t *pcBits);
-CPUMSELREGHID *
+PCPUMSELREGHID 
-VMMDECL(int)        SELMGetLDTFromSel(PVM pVM, RTSEL SelLdt, PRTGCPTR ppvLdt, unsigned *pcbLimit);
-

trunk/include/iprt/autores.h

@@ -32 +32 @@
-
-#include <iprt/types.h>
-#include <iprt/mem.h>
-#include <iprt/assert.h>
-
@@ -209 +208 @@
-};
-
+
+/* include after template definition */
+#include <iprt/mem.h>
+
-#endif
-

trunk/include/iprt/mem.h

@@ -370 +370 @@
-
-#ifdef __cplusplus
+# include <iprt/assert.h>
-
-/**