diff -urN vbox-trunk-bk\include/iprt/cpp/ministring.h vbox-trunk\include/iprt/cpp/ministring.h
old
|
new
|
|
1010 | 1010 | * |
1011 | 1011 | * @relates RTCString |
1012 | 1012 | */ |
1013 | | RTDECL(const RTCString) operator+(const RTCString &a_rstr1, const RTCString &a_rstr2); |
| 1013 | const RTCString operator+(const RTCString &a_rstr1, const RTCString &a_rstr2); |
1014 | 1014 | |
1015 | 1015 | /** |
1016 | 1016 | * Concatenate two strings. |
… |
… |
|
1021 | 1021 | * |
1022 | 1022 | * @relates RTCString |
1023 | 1023 | */ |
1024 | | RTDECL(const RTCString) operator+(const RTCString &a_rstr1, const char *a_psz2); |
| 1024 | const RTCString operator+(const RTCString &a_rstr1, const char *a_psz2); |
1025 | 1025 | |
1026 | 1026 | /** |
1027 | 1027 | * Concatenate two strings. |
… |
… |
|
1032 | 1032 | * |
1033 | 1033 | * @relates RTCString |
1034 | 1034 | */ |
1035 | | RTDECL(const RTCString) operator+(const char *a_psz1, const RTCString &a_rstr2); |
| 1035 | const RTCString operator+(const char *a_psz1, const RTCString &a_rstr2); |
1036 | 1036 | |
1037 | 1037 | /** |
1038 | 1038 | * Class with RTCString::printf as constructor for your convenience. |
diff -urN vbox-trunk-bk\include/iprt/string.h vbox-trunk\include/iprt/string.h
old
|
new
|
|
85 | 85 | # undef ffs |
86 | 86 | # undef strpbrk |
87 | 87 | |
| 88 | #elif defined(RT_OS_OS2) |
| 89 | # define __USE_GNU |
| 90 | # include <string.h> |
88 | 91 | #else |
89 | 92 | # include <string.h> |
90 | 93 | #endif |
… |
… |
|
115 | 118 | |
116 | 119 | #if !defined(RT_OS_LINUX) || !defined(_GNU_SOURCE) |
117 | 120 | RT_C_DECLS_BEGIN |
| 121 | #ifndef RT_OS_OS2 |
118 | 122 | void *memrchr(const char *pv, int ch, size_t cb); |
| 123 | #endif |
119 | 124 | RT_C_DECLS_END |
120 | 125 | #endif |
121 | 126 | |
diff -urN vbox-trunk-bk\include/iprt/x86extra.mac vbox-trunk\include/iprt/x86extra.mac
old
|
new
|
|
140 | 140 | .ds resw 1 |
141 | 141 | .selLdt resw 1 |
142 | 142 | endstruc |
| 143 | %ifndef RT_OS_OS2 |
143 | 144 | AssertCompileSize(X86TSS16, 44) |
| 145 | %endif |
144 | 146 | |
145 | 147 | |
146 | 148 | struc X86TSS32 |
… |
… |
|
203 | 205 | .offIoBitmap resw 1 |
204 | 206 | .IntRedirBitmap resb 32 |
205 | 207 | endstruc |
| 208 | %ifndef RT_OS_OS2 |
206 | 209 | AssertCompileSize(X86TSS64, 136) |
| 210 | %endif |
207 | 211 | |
208 | 212 | %endif |
209 | 213 | |
diff -urN vbox-trunk-bk\include/VBox/com/defs.h vbox-trunk\include/VBox/com/defs.h
old
|
new
|
|
42 | 42 | # endif |
43 | 43 | # undef RT_MAX |
44 | 44 | |
| 45 | #if !defined(QT_GUI_LIB) |
| 46 | |
45 | 47 | /* Make sure OS/2 Toolkit headers are pulled in to have BOOL/ULONG/etc. typedefs |
46 | 48 | * already defined in order to be able to redefine them using #define. */ |
47 | 49 | # define INCL_BASE |
… |
… |
|
52 | 54 | # undef FALSE |
53 | 55 | # undef TRUE |
54 | 56 | |
| 57 | #else |
| 58 | # include <QtGui/qwindowdefs_pm.h> |
| 59 | #endif /* !defined(QT_CORE_LIB) */ |
| 60 | |
55 | 61 | /* */ |
56 | 62 | # undef RT_MAX |
57 | 63 | # ifdef REDEFINE_RT_MAX |
58 | 64 | # define RT_MAX(Value1, Value2) ( (Value1) >= (Value2) ? (Value1) : (Value2) ) |
59 | 65 | # endif |
60 | 66 | |
| 67 | # undef ULONG |
| 68 | # undef LONG |
| 69 | # undef USHORT |
| 70 | |
61 | 71 | #endif /* defined(RT_OS_OS2) */ |
62 | 72 | |
63 | 73 | /* Include iprt/types.h (which also includes iprt/types.h) now to make sure iprt |
diff -urN vbox-trunk-bk\include/VBox/intnet.h vbox-trunk\include/VBox/intnet.h
old
|
new
|
|
1292 | 1292 | INTNETR0DECL(int) IntNetR0IfSetActive(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fActive); |
1293 | 1293 | INTNETR0DECL(int) IntNetR0IfSend(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession); |
1294 | 1294 | INTNETR0DECL(int) IntNetR0IfWait(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, uint32_t cMillies); |
1295 | | INTNETR0DECL(int) IntNetR0IfAbortWait(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession); |
| 1295 | INTNETR0DECL(int) IntNetR0IfAbortWait(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fNoMoreWaits); |
1296 | 1296 | |
1297 | 1297 | /** @} */ |
1298 | 1298 | #endif /* IN_RING0 */ |
diff -urN vbox-trunk-bk\include/VBox/sup.h vbox-trunk\include/VBox/sup.h
old
|
new
|
|
461 | 461 | #if defined(IN_SUP_R3) || defined(IN_SUP_R0) |
462 | 462 | extern DECLEXPORT(PSUPGLOBALINFOPAGE) g_pSUPGlobalInfoPage; |
463 | 463 | |
464 | | #elif !defined(IN_RING0) || defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) |
| 464 | #elif !defined(IN_RING0) || defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) || defined(RT_OS_OS2) |
465 | 465 | extern DECLIMPORT(PSUPGLOBALINFOPAGE) g_pSUPGlobalInfoPage; |
466 | 466 | |
467 | 467 | #else /* IN_RING0 && !RT_OS_WINDOWS */ |
diff -urN vbox-trunk-bk\include/VBox/vmm/dbgf.h vbox-trunk\include/VBox/vmm/dbgf.h
old
|
new
|
|
1516 | 1516 | VMMR3DECL(int) DBGFR3RegNmQueryU64( PUVM pUVM, VMCPUID idDefCpu, const char *pszReg, uint64_t *pu64); |
1517 | 1517 | VMMR3DECL(int) DBGFR3RegNmQueryU128(PUVM pUVM, VMCPUID idDefCpu, const char *pszReg, PRTUINT128U pu128); |
1518 | 1518 | /*VMMR3DECL(int) DBGFR3RegNmQueryLrd( PUVM pUVM, VMCPUID idDefCpu, const char *pszReg, long double *plrd);*/ |
1519 | | VMMR3DECL(int) DBGFR3RegNmQueryXdtr(PUVM pUVM, VMCPUID idDefCpu, const char *pszReg, uint64_t *pu64Base, uint16_t *pu16Limit); |
| 1519 | VMMR3DECL(int) DBGFR3RegNmQueryXdtr(PUVM pUVM, VMCPUID idDefCpu, const char *pszReg, uint64_t *pu64Base, uint32_t *pu16Limit); |
1520 | 1520 | VMMR3DECL(int) DBGFR3RegNmQueryBatch(PUVM pUVM,VMCPUID idDefCpu, PDBGFREGENTRYNM paRegs, size_t cRegs); |
1521 | 1521 | VMMR3DECL(int) DBGFR3RegNmQueryAllCount(PUVM pUVM, size_t *pcRegs); |
1522 | 1522 | VMMR3DECL(int) DBGFR3RegNmQueryAll( PUVM pUVM, PDBGFREGENTRYNM paRegs, size_t cRegs); |
diff -urN vbox-trunk-bk\include/VBox/vmm/gmm.h vbox-trunk\include/VBox/vmm/gmm.h
old
|
new
|
|
418 | 418 | GMMR0DECL(int) GMMR0ResetSharedModules(PVM pVM, VMCPUID idCpu); |
419 | 419 | GMMR0DECL(int) GMMR0CheckSharedModulesStart(PVM pVM); |
420 | 420 | GMMR0DECL(int) GMMR0CheckSharedModulesEnd(PVM pVM); |
421 | | GMMR0DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession); |
422 | | GMMR0DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession); |
| 421 | GMMR0DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM); |
| 422 | GMMR0DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM); |
423 | 423 | |
424 | 424 | /** |
425 | 425 | * Request buffer for GMMR0InitialReservationReq / VMMR0_DO_GMM_INITIAL_RESERVATION. |
diff -urN vbox-trunk-bk\include/VBox/vmm/hm_vmx.mac vbox-trunk\include/VBox/vmm/hm_vmx.mac
old
|
new
|
|
175 | 175 | .uHostFSBase resq 1 |
176 | 176 | .uHostGSBase resq 1 |
177 | 177 | endstruc |
| 178 | |
| 179 | %ifndef RT_OS_OS2 |
| 180 | ; // vs -- symbol referencies not supported in preprocess-only mode |
178 | 181 | AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr, 16-2) |
179 | 182 | AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr, 32-2) |
180 | 183 | AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase, 40) |
181 | 184 | AssertCompileSize(VMXRESTOREHOST, 56) |
182 | | |
| 185 | %endif |
diff -urN vbox-trunk-bk\include/VBox/vmm/pdmapi.h vbox-trunk\include/VBox/vmm/pdmapi.h
old
|
new
|
|
46 | 46 | VMM_INT_DECL(int) PDMIoApicSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level, uint32_t uTagSrc); |
47 | 47 | VMM_INT_DECL(int) PDMIoApicSendMsi(PVM pVM, RTGCPHYS GCAddr, uint32_t uValue, uint32_t uTagSrc); |
48 | 48 | VMM_INT_DECL(bool) PDMHasApic(PVM pVM); |
49 | | VMM_INT_DECL(int) PDMApicHasPendingIrq(PVM pVM, bool *pfPending); |
| 49 | VMM_INT_DECL(int) PDMApicHasPendingIrq(PVMCPU pVCpu, bool *pfPending); |
50 | 50 | VMMDECL(int) PDMApicSetBase(PVMCPU pVCpu, uint64_t u64Base); |
51 | 51 | VMMDECL(int) PDMApicGetBase(PVMCPU pVCpu, uint64_t *pu64Base); |
52 | 52 | VMMDECL(int) PDMApicSetTPR(PVMCPU pVCpu, uint8_t u8TPR); |