Changeset 85099 in vbox for trunk/include/VBox
- Timestamp:
- Jul 7, 2020 7:02:29 PM (4 years ago)
- Location:
- trunk/include/VBox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/VBoxGuestLib.h
r84548 r85099 104 104 * @param type Return type. */ 105 105 # ifdef RT_OS_DARWIN /** @todo probably apply to all, but don't want a forest fire on our hands right now. */ 106 # define DECLR0VBGL(type) DECLHIDDEN( type) VBOXCALL106 # define DECLR0VBGL(type) DECLHIDDEN(DECL_NOTHROW(type)) VBOXCALL 107 107 # else 108 # define DECLR0VBGL(type) typeVBOXCALL108 # define DECLR0VBGL(type) DECL_NOTHROW(type) VBOXCALL 109 109 # endif 110 110 # define DECLVBGL(type) DECLR0VBGL(type) … … 544 544 * @param type The return type of the function declaration. 545 545 */ 546 # define VBGLR3DECL(type) DECL HIDDEN(type) VBOXCALL546 # define VBGLR3DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 547 547 548 548 /** @name General-purpose functions -
trunk/include/VBox/cdefs.h
r82968 r85099 121 121 #if defined(IN_DIS) 122 122 # ifdef IN_DIS_STATIC 123 # define DISDECL(type) DECL HIDDEN(type) VBOXCALL124 # else 125 # define DISDECL(type) DECL EXPORT(type) VBOXCALL126 # endif 127 #else 128 # define DISDECL(type) DECL IMPORT(type) VBOXCALL123 # define DISDECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 124 # else 125 # define DISDECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 126 # endif 127 #else 128 # define DISDECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 129 129 #endif 130 130 … … 142 142 */ 143 143 #if defined(IN_DBG_R3) || defined(IN_DBG) 144 # define DBGDECL(type) DECL EXPORT(type) VBOXCALL145 #else 146 # define DBGDECL(type) DECL IMPORT(type) VBOXCALL144 # define DBGDECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 145 #else 146 # define DBGDECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 147 147 #endif 148 148 … … 158 158 */ 159 159 #ifdef IN_INTNET_R3 160 # define INTNETR3DECL(type) DECL EXPORT(type) VBOXCALL161 #else 162 # define INTNETR3DECL(type) DECL IMPORT(type) VBOXCALL160 # define INTNETR3DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 161 #else 162 # define INTNETR3DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 163 163 #endif 164 164 … … 172 172 */ 173 173 #ifdef IN_INTNET_R0 174 # define INTNETR0DECL(type) DECL EXPORT(type) VBOXCALL175 #else 176 # define INTNETR0DECL(type) DECL IMPORT(type) VBOXCALL174 # define INTNETR0DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 175 #else 176 # define INTNETR0DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 177 177 #endif 178 178 … … 188 188 */ 189 189 #ifdef IN_PCIRAW_R3 190 # define PCIRAWR3DECL(type) DECL EXPORT(type) VBOXCALL191 #else 192 # define PCIRAWR3DECL(type) DECL IMPORT(type) VBOXCALL190 # define PCIRAWR3DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 191 #else 192 # define PCIRAWR3DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 193 193 #endif 194 194 … … 202 202 */ 203 203 #ifdef IN_PCIRAW_R0 204 # define PCIRAWR0DECL(type) DECL EXPORT(type) VBOXCALL205 #else 206 # define PCIRAWR0DECL(type) DECL IMPORT(type) VBOXCALL204 # define PCIRAWR0DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 205 #else 206 # define PCIRAWR0DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 207 207 #endif 208 208 … … 218 218 */ 219 219 #ifdef IN_REM_R3 220 # define REMR3DECL(type) DECL EXPORT(type) VBOXCALL221 #else 222 # define REMR3DECL(type) DECL IMPORT(type) VBOXCALL220 # define REMR3DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 221 #else 222 # define REMR3DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 223 223 #endif 224 224 … … 235 235 #ifdef IN_SUP_R3 236 236 # ifdef IN_SUP_STATIC 237 # define SUPR3DECL(type) DECL HIDDEN(type) VBOXCALL238 # else 239 # define SUPR3DECL(type) DECL EXPORT(type) VBOXCALL237 # define SUPR3DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 238 # else 239 # define SUPR3DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 240 240 # endif 241 241 #else 242 242 # ifdef IN_SUP_STATIC 243 # define SUPR3DECL(type) DECL HIDDEN(type) VBOXCALL244 # else 245 # define SUPR3DECL(type) DECL IMPORT(type) VBOXCALL243 # define SUPR3DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 244 # else 245 # define SUPR3DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 246 246 # endif 247 247 #endif … … 261 261 #ifdef IN_SUP_R0 262 262 # ifdef IN_SUP_STATIC 263 # define SUPR0DECL(type) DECL HIDDEN(type) VBOXCALL264 # else 265 # define SUPR0DECL(type) DECL EXPORT(type) VBOXCALL263 # define SUPR0DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 264 # else 265 # define SUPR0DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 266 266 # endif 267 267 #else 268 268 # ifdef IN_SUP_STATIC 269 # define SUPR0DECL(type) DECL HIDDEN(type) VBOXCALL270 # else 271 # define SUPR0DECL(type) DECL IMPORT(type) VBOXCALL269 # define SUPR0DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 270 # else 271 # define SUPR0DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 272 272 # endif 273 273 #endif … … 282 282 */ 283 283 #ifdef IN_SUP_RC 284 # define SUPRCDECL(type) DECL EXPORT(type) VBOXCALL285 #else 286 # define SUPRCDECL(type) DECL IMPORT(type) VBOXCALL284 # define SUPRCDECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 285 #else 286 # define SUPRCDECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 287 287 #endif 288 288 … … 296 296 */ 297 297 #if defined(IN_SUP_R0) || defined(IN_SUP_R3) || defined(IN_SUP_RC) 298 # define SUPDECL(type) DECL EXPORT(type) VBOXCALL299 #else 300 # define SUPDECL(type) DECL IMPORT(type) VBOXCALL298 # define SUPDECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 299 #else 300 # define SUPDECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 301 301 #endif 302 302 … … 313 313 # define USBLIB_DECL(type) type VBOXCALL 314 314 #elif defined(IN_USBLIB) 315 # define USBLIB_DECL(type) DECL EXPORT(type) VBOXCALL316 #else 317 # define USBLIB_DECL(type) DECL IMPORT(type) VBOXCALL315 # define USBLIB_DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 316 #else 317 # define USBLIB_DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 318 318 #endif 319 319 … … 334 334 #ifdef IN_VMM_R3 335 335 # ifdef IN_VMM_STATIC 336 # define VMMR3DECL(type) DECL HIDDEN(type) VBOXCALL337 # else 338 # define VMMR3DECL(type) DECL EXPORT(type) VBOXCALL336 # define VMMR3DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 337 # else 338 # define VMMR3DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 339 339 # endif 340 340 #elif defined(IN_RING3) 341 341 # ifdef IN_VMM_STATIC 342 # define VMMR3DECL(type) DECL HIDDEN(type) VBOXCALL343 # else 344 # define VMMR3DECL(type) DECL IMPORT(type) VBOXCALL342 # define VMMR3DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 343 # else 344 # define VMMR3DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 345 345 # endif 346 346 #else … … 357 357 */ 358 358 #ifdef IN_VMM_R0 359 # define VMMR0DECL(type) DECL EXPORT(type) VBOXCALL359 # define VMMR0DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 360 360 #elif defined(IN_RING0) 361 # define VMMR0DECL(type) DECL IMPORT(type) VBOXCALL361 # define VMMR0DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 362 362 #else 363 363 # define VMMR0DECL(type) DECL_INVALID(type) … … 373 373 */ 374 374 #ifdef IN_VMM_RC 375 # define VMMRCDECL(type) DECL EXPORT(type) VBOXCALL375 # define VMMRCDECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 376 376 #elif defined(IN_RC) 377 # define VMMRCDECL(type) DECL IMPORT(type) VBOXCALL377 # define VMMRCDECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 378 378 #else 379 379 # define VMMRCDECL(type) DECL_INVALID(type) … … 385 385 */ 386 386 #if defined(IN_VMM_R0) || defined(IN_VMM_RC) 387 # define VMMRZDECL(type) DECL EXPORT(type) VBOXCALL387 # define VMMRZDECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 388 388 #elif defined(IN_RING0) || defined(IN_RZ) 389 # define VMMRZDECL(type) DECL IMPORT(type) VBOXCALL389 # define VMMRZDECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 390 390 #else 391 391 # define VMMRZDECL(type) DECL_INVALID(type) … … 397 397 */ 398 398 #ifdef IN_VMM_STATIC 399 # define VMMDECL(type) DECL HIDDEN(type) VBOXCALL399 # define VMMDECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 400 400 #elif defined(IN_VMM_R3) || defined(IN_VMM_R0) || defined(IN_VMM_RC) 401 # define VMMDECL(type) DECL EXPORT(type) VBOXCALL402 #else 403 # define VMMDECL(type) DECL IMPORT(type) VBOXCALL401 # define VMMDECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 402 #else 403 # define VMMDECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 404 404 #endif 405 405 … … 409 409 */ 410 410 #if defined(IN_VMM_R3) || defined(IN_VMM_R0) || defined(IN_VMM_RC) 411 # define VMM_INT_DECL(type) DECL HIDDEN(type) VBOXCALL411 # define VMM_INT_DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 412 412 #else 413 413 # define VMM_INT_DECL(type) DECL_INVALID(type) … … 419 419 */ 420 420 #ifdef IN_VMM_R3 421 # define VMMR3_INT_DECL(type) DECL HIDDEN(type) VBOXCALL421 # define VMMR3_INT_DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 422 422 #else 423 423 # define VMMR3_INT_DECL(type) DECL_INVALID(type) … … 429 429 */ 430 430 #ifdef IN_VMM_R0 431 # define VMMR0_INT_DECL(type) DECL HIDDEN(type) VBOXCALL431 # define VMMR0_INT_DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 432 432 #else 433 433 # define VMMR0_INT_DECL(type) DECL_INVALID(type) … … 439 439 */ 440 440 #ifdef IN_VMM_RC 441 # define VMMRC_INT_DECL(type) DECL HIDDEN(type) VBOXCALL441 # define VMMRC_INT_DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 442 442 #else 443 443 # define VMMRC_INT_DECL(type) DECL_INVALID(type) … … 449 449 */ 450 450 #if defined(IN_VMM_RC) || defined(IN_VMM_R0) 451 # define VMMRZ_INT_DECL(type) DECL HIDDEN(type) VBOXCALL451 # define VMMRZ_INT_DECL(type) DECL_HIDDEN_NOTHROW(type) VBOXCALL 452 452 #else 453 453 # define VMMRZ_INT_DECL(type) DECL_INVALID(type) … … 465 465 #ifdef IN_VBOXDDU 466 466 # ifdef IN_VBOXDDU_STATIC 467 # define VBOXDDU_DECL(type) type468 # else 469 # define VBOXDDU_DECL(type) DECLEXPORT(type) VBOXCALL470 # endif 471 #else 472 # define VBOXDDU_DECL(type) DECLIMPORT(type) VBOXCALL467 # define VBOXDDU_DECL(type) type 468 # else 469 # define VBOXDDU_DECL(type) DECL_EXPORT_NOTHROW(type) VBOXCALL 470 # endif 471 #else 472 # define VBOXDDU_DECL(type) DECL_IMPORT_NOTHROW(type) VBOXCALL 473 473 #endif 474 474
Note:
See TracChangeset
for help on using the changeset viewer.