diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2018-12-25 07:21:57 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2018-12-25 07:21:57 +0000 |
| commit | a81ea2b37de45ca7337c0b227213b61a124cd262 (patch) | |
| tree | 30fc3e90f584e955179cb618c0651fed6a35d675 | |
| parent | 6548742068e20b56ce03b3ac8ea6f1cd6603c219 (diff) | |
| download | VirtualBox-svn-a81ea2b37de45ca7337c0b227213b61a124cd262.tar.gz | |
scm --fix-err-h src/ (bugref:9344)
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@76474 cfe28804-0f27-0410-a406-dd0f0b0b656f
229 files changed, 240 insertions, 240 deletions
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxCrHgsmi.cpp b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxCrHgsmi.cpp index 94b729ca52a..4b581d3306d 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxCrHgsmi.cpp +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxCrHgsmi.cpp @@ -16,7 +16,7 @@ */ #include <VBoxCrHgsmi.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include "VBoxUhgsmiKmt.h" diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiDisp.cpp b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiDisp.cpp index 378514ec2de..1a557200bb4 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiDisp.cpp +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiDisp.cpp @@ -21,7 +21,7 @@ #define VBOXUHGSMID3D_GET(_p) VBOXUHGSMID3D_GET_PRIVATE(_p, VBOXUHGSMI_PRIVATE_D3D) #include <iprt/mem.h> -#include <iprt/err.h> +#include <iprt/errcore.h> DECLCALLBACK(int) vboxUhgsmiD3DBufferDestroy(PVBOXUHGSMI_BUFFER pBuf) { diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiKmt.cpp b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiKmt.cpp index 091f4714341..fd70fe575a7 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiKmt.cpp +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiKmt.cpp @@ -18,7 +18,7 @@ #include "VBoxDispD3DCmn.h" #include <iprt/mem.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <cr_protocol.h> diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp index a5665378ca3..4d4a562899c 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispMpLogger.cpp @@ -32,7 +32,7 @@ #include <iprt/asm.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <stdio.h> diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/Svga.cpp b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/Svga.cpp index 189ecf79efb..76fa7cd7d2c 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/Svga.cpp +++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/Svga.cpp @@ -20,7 +20,7 @@ #include "SvgaHw.h" #include "SvgaCmd.h" -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/memobj.h> diff --git a/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/debug.c b/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/debug.c index 6b22e66ffbb..847c2c2b69e 100644 --- a/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/debug.c +++ b/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/debug.c @@ -47,7 +47,7 @@ #ifdef VBOX_WITH_WDDM #include <VBoxDispMpLogger.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #else #include <iprt/log.h> #endif diff --git a/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.c b/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.c index 396179d8173..989260bf364 100644 --- a/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.c +++ b/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.c @@ -21,7 +21,7 @@ #include "vboxext.h" #ifdef VBOX_WITH_WDDM #include <VBoxCrHgsmi.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #endif WINE_DEFAULT_DEBUG_CHANNEL(d3d_vbox); diff --git a/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp b/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp index 014bb73f849..81059084d58 100644 --- a/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp +++ b/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp @@ -28,7 +28,7 @@ #include "exdll.h" #pragma warning(pop) -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/ldr.h> #include <iprt/localipc.h> diff --git a/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp b/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp index 729523cc080..3f7fb4bf476 100644 --- a/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp +++ b/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp @@ -18,7 +18,7 @@ #define LOG_GROUP LOG_GROUP_DRV_MOUSE #include <iprt/asm.h> #include <iprt/initterm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <stdarg.h> diff --git a/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp b/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp index 01933f9b49d..62812c3fc55 100644 --- a/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp +++ b/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp @@ -24,7 +24,7 @@ #include <iprt/win/windows.h> #include <credentialprovider.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/VBoxGuestLib.h> #include "VBoxCredentialProvider.h" diff --git a/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp b/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp index 167f88571c1..404e1944941 100644 --- a/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp +++ b/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp @@ -19,7 +19,7 @@ #include <stdio.h> /* Needed for swprintf() */ #include <VBox/VBoxGuestLib.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include "Dialog.h" #include "WinWlx.h" diff --git a/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp b/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp index eca7cfc087a..ada69efe11e 100644 --- a/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp +++ b/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp @@ -22,7 +22,7 @@ #include <iprt/buildconfig.h> #include <iprt/initterm.h> #include <iprt/ldr.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/VBoxGuestLib.h> diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp index 407dca175db..f0f1cb79397 100644 --- a/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp +++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp @@ -18,7 +18,7 @@ #include "VBoxTray.h" #define _WIN32_WINNT 0x0601 #include <iprt/log.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <malloc.h> diff --git a/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp b/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp index 40f2d0c2136..7aa2549ea40 100644 --- a/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp +++ b/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp @@ -30,7 +30,7 @@ #include <iprt/asm.h> #include <iprt/assert.h> #include <iprt/critsect.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/ldr.h> #include <iprt/list.h> #include <iprt/localipc.h> diff --git a/src/VBox/Additions/WINNT/tools/VBoxCertUtil.cpp b/src/VBox/Additions/WINNT/tools/VBoxCertUtil.cpp index f49ba07c3ba..a563038d808 100644 --- a/src/VBox/Additions/WINNT/tools/VBoxCertUtil.cpp +++ b/src/VBox/Additions/WINNT/tools/VBoxCertUtil.cpp @@ -23,7 +23,7 @@ #include <Wincrypt.h> #include <iprt/buildconfig.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/file.h> #include <iprt/getopt.h> #include <iprt/initterm.h> diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp index ad98fb390a6..b834645c3de 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp @@ -23,7 +23,7 @@ #include <iprt/cpp/autores.h> #include <iprt/buildconfig.h> #include <iprt/ctype.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/getopt.h> #include <iprt/initterm.h> #include <iprt/mem.h> diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-win.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-win.cpp index 12dcd086a15..0a60016beee 100644 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-win.cpp +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-win.cpp @@ -35,7 +35,7 @@ #include <iprt/nt/nt.h> #include "VBoxGuestR0LibInternal.h" #include <VBox/VBoxGuest.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc.cpp index 91e43866561..0b03abf7e4e 100644 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc.cpp +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc.cpp @@ -33,7 +33,7 @@ * Header Files * *********************************************************************************************************************************/ #include "VBoxGuestR0LibInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/VBoxGuest.h> /*#include <iprt/asm.h>*/ diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibAutoLogon.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibAutoLogon.cpp index a34d7469066..4871fb8e943 100644 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibAutoLogon.cpp +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibAutoLogon.cpp @@ -34,7 +34,7 @@ #endif #include "VBoxGuestR3LibInternal.h" -#include <iprt/err.h> +#include <iprt/errcore.h> /** diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCpuHotPlug.cpp index 5489d11ee4c..4c5f36a91e1 100644 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCpuHotPlug.cpp +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCpuHotPlug.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include "VBoxGuestR3LibInternal.h" #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> /** diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGR.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGR.cpp index ee0a29e56c3..6ae0a3745bf 100644 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGR.cpp +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGR.cpp @@ -31,7 +31,7 @@ #include <iprt/mem.h> #include <iprt/assert.h> #include <iprt/string.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include "VBoxGuestR3LibInternal.h" diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestUser.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestUser.cpp index 38e350f3ea8..30f2c61e54b 100644 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestUser.cpp +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestUser.cpp @@ -31,7 +31,7 @@ *********************************************************************************************************************************/ #include <iprt/assert.h> #include <VBox/log.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/string.h> diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibSeamless.cpp index d4ca071ba5a..5cbe65992b3 100644 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibSeamless.cpp +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibSeamless.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <VBox/log.h> diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c index ab9a631b669..8dff251fc77 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c @@ -24,7 +24,7 @@ #include "fakedri_drv.h" #include "dri_glx.h" #include "iprt/mem.h" -#include "iprt/err.h" +#include <iprt/errcore.h> #include <dlfcn.h> #include <elf.h> #include <unistd.h> diff --git a/src/VBox/Additions/common/crOpenGL/load.c b/src/VBox/Additions/common/crOpenGL/load.c index 7ed012eed8a..a4b0cf8ce4e 100644 --- a/src/VBox/Additions/common/crOpenGL/load.c +++ b/src/VBox/Additions/common/crOpenGL/load.c @@ -20,7 +20,7 @@ #include <signal.h> #include <iprt/initterm.h> #include <iprt/thread.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> #ifndef WINDOWS # include <sys/types.h> diff --git a/src/VBox/Additions/haiku/VBoxMouse/VBoxMouse.cpp b/src/VBox/Additions/haiku/VBoxMouse/VBoxMouse.cpp index 8b9aa23a1da..083834ff923 100644 --- a/src/VBox/Additions/haiku/VBoxMouse/VBoxMouse.cpp +++ b/src/VBox/Additions/haiku/VBoxMouse/VBoxMouse.cpp @@ -59,7 +59,7 @@ #include <VBoxGuestInternal.h> #include <VBox/VMMDev.h> #include <VBox/log.h> -#include <iprt/err.h> +#include <iprt/errcore.h> /* Export as global symbol with C linkage, RTDECL is necessary. */ RTDECL(BInputServerDevice *) diff --git a/src/VBox/Additions/haiku/VBoxMouse/VBoxMouseFilter.cpp b/src/VBox/Additions/haiku/VBoxMouse/VBoxMouseFilter.cpp index 9abb219d410..fedf1cb3b1b 100644 --- a/src/VBox/Additions/haiku/VBoxMouse/VBoxMouseFilter.cpp +++ b/src/VBox/Additions/haiku/VBoxMouse/VBoxMouseFilter.cpp @@ -57,7 +57,7 @@ #include <VBox/VBoxGuestLib.h> #include <VBoxGuestInternal.h> #include <VBox/log.h> -#include <iprt/err.h> +#include <iprt/errcore.h> /** @todo can this be merged with VBoxMouse? */ diff --git a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c index ab934d231e2..bc4da59ce9d 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c @@ -39,7 +39,7 @@ #include <iprt/assert.h> #include <iprt/initterm.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/mem.h> #include <iprt/rand.h> diff --git a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c index 066cd1e9f7b..f6124004a59 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c @@ -33,7 +33,7 @@ #include <iprt/asm.h> #include <iprt/cdefs.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/log.h> #include <sys/cmn_err.h> diff --git a/src/VBox/Additions/x11/VBoxClient/display.cpp b/src/VBox/Additions/x11/VBoxClient/display.cpp index 4ffffd80673..4fd880a2f71 100644 --- a/src/VBox/Additions/x11/VBoxClient/display.cpp +++ b/src/VBox/Additions/x11/VBoxClient/display.cpp @@ -17,7 +17,7 @@ #include "VBoxClient.h" -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/file.h> #include <iprt/mem.h> #include <iprt/string.h> diff --git a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp index 2a651cf9075..b2c5737c9be 100644 --- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp +++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp @@ -16,7 +16,7 @@ */ #include <stdio.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/ldr.h> #include <iprt/string.h> diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp index 0e9b2b8d37b..28105b3d09f 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp +++ b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp @@ -20,7 +20,7 @@ * Header files * *********************************************************************************************************************************/ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <iprt/vector.h> #include <VBox/log.h> diff --git a/src/VBox/Additions/x11/VBoxClient/seamless.cpp b/src/VBox/Additions/x11/VBoxClient/seamless.cpp index e50d2893c3b..102cfafea7c 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless.cpp +++ b/src/VBox/Additions/x11/VBoxClient/seamless.cpp @@ -25,7 +25,7 @@ #include <VBox/log.h> #include <VBox/VBoxGuestLib.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include "VBoxClient.h" diff --git a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp index eb19ebca427..1dd6c98ec4b 100644 --- a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp +++ b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp @@ -17,7 +17,7 @@ #include <stdlib.h> /* exit() */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/semaphore.h> #include <iprt/stream.h> diff --git a/src/VBox/Additions/x11/vboxmouse/vboxmouse.c b/src/VBox/Additions/x11/vboxmouse/vboxmouse.c index 5f7d1ca5ac0..225c72ec01d 100644 --- a/src/VBox/Additions/x11/vboxmouse/vboxmouse.c +++ b/src/VBox/Additions/x11/vboxmouse/vboxmouse.c @@ -46,7 +46,7 @@ #include <VBox/VMMDev.h> /* for VMMDEV_MOUSE_XXX */ #include <VBox/VBoxGuestLib.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <xf86.h> #include <xf86Xinput.h> #include <mipointer.h> diff --git a/src/VBox/Debugger/DBGCDumpImage.cpp b/src/VBox/Debugger/DBGCDumpImage.cpp index 7d1289fc122..18be9b8406c 100644 --- a/src/VBox/Debugger/DBGCDumpImage.cpp +++ b/src/VBox/Debugger/DBGCDumpImage.cpp @@ -23,7 +23,7 @@ #include <VBox/dbg.h> #include <VBox/vmm/dbgf.h> #include <VBox/param.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/Debugger/DBGCGdbRemoteStub.cpp b/src/VBox/Debugger/DBGCGdbRemoteStub.cpp index aa57af4d904..dd7132ad0a5 100644 --- a/src/VBox/Debugger/DBGCGdbRemoteStub.cpp +++ b/src/VBox/Debugger/DBGCGdbRemoteStub.cpp @@ -21,5 +21,5 @@ *********************************************************************************************************************************/ #include <VBox/dbg.h> #include <VBox/vmm/dbgf.h> -#include <VBox/err.h> +#include <iprt/errcore.h> diff --git a/src/VBox/Debugger/DBGPlugInDiggers.cpp b/src/VBox/Debugger/DBGPlugInDiggers.cpp index 14301d30ab3..1ce7196a339 100644 --- a/src/VBox/Debugger/DBGPlugInDiggers.cpp +++ b/src/VBox/Debugger/DBGPlugInDiggers.cpp @@ -24,7 +24,7 @@ #include <VBox/vmm/dbgf.h> #include "DBGPlugIns.h" #include <VBox/version.h> -#include <VBox/err.h> +#include <iprt/errcore.h> DECLEXPORT(int) DbgPlugInEntry(DBGFPLUGINOP enmOperation, PUVM pUVM, uintptr_t uArg) diff --git a/src/VBox/Debugger/VBoxDbg.cpp b/src/VBox/Debugger/VBoxDbg.cpp index d5537c80e96..ff22ffea9ae 100644 --- a/src/VBox/Debugger/VBoxDbg.cpp +++ b/src/VBox/Debugger/VBoxDbg.cpp @@ -28,7 +28,7 @@ #endif /* !RT_OS_WINDOWS */ #include <VBox/dbggui.h> #include <VBox/vmm/vm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <iprt/alloc.h> diff --git a/src/VBox/Debugger/VBoxDbgBase.cpp b/src/VBox/Debugger/VBoxDbgBase.cpp index 3aff64fa4f1..d5fbf17d0c5 100644 --- a/src/VBox/Debugger/VBoxDbgBase.cpp +++ b/src/VBox/Debugger/VBoxDbgBase.cpp @@ -20,7 +20,7 @@ * Header Files * *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_DBGG -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> #include <iprt/assert.h> #include <limits.h> diff --git a/src/VBox/Debugger/VBoxDbgConsole.cpp b/src/VBox/Debugger/VBoxDbgConsole.cpp index b97fed90153..f99074b50d7 100644 --- a/src/VBox/Debugger/VBoxDbgConsole.cpp +++ b/src/VBox/Debugger/VBoxDbgConsole.cpp @@ -33,7 +33,7 @@ #include <VBox/dbg.h> #include <VBox/vmm/cfgm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/thread.h> #include <iprt/tcp.h> diff --git a/src/VBox/Debugger/VBoxDbgGui.cpp b/src/VBox/Debugger/VBoxDbgGui.cpp index 63c3f01c04d..73385152b14 100644 --- a/src/VBox/Debugger/VBoxDbgGui.cpp +++ b/src/VBox/Debugger/VBoxDbgGui.cpp @@ -23,7 +23,7 @@ #define VBOX_COM_NO_ATL #include <VBox/com/defs.h> #include <VBox/vmm/vm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include "VBoxDbgGui.h" #include <QDesktopWidget> diff --git a/src/VBox/Debugger/VBoxDbgStatsQt.cpp b/src/VBox/Debugger/VBoxDbgStatsQt.cpp index 0f78ba3d398..5a866e541ba 100644 --- a/src/VBox/Debugger/VBoxDbgStatsQt.cpp +++ b/src/VBox/Debugger/VBoxDbgStatsQt.cpp @@ -35,7 +35,7 @@ #include <QContextMenuEvent> #include <QHeaderView> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/string.h> #include <iprt/mem.h> diff --git a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp index 289c6b09d89..044c2c999c3 100644 --- a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp +++ b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp @@ -22,7 +22,7 @@ #include <qapplication.h> #include <VBox/dbggui.h> #include <VBox/vmm/vm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/Devices/Audio/DevHDACommon.cpp b/src/VBox/Devices/Audio/DevHDACommon.cpp index 402b99172c4..21d0f225889 100644 --- a/src/VBox/Devices/Audio/DevHDACommon.cpp +++ b/src/VBox/Devices/Audio/DevHDACommon.cpp @@ -20,7 +20,7 @@ * Header Files * *********************************************************************************************************************************/ #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #define LOG_GROUP LOG_GROUP_DEV_HDA #include <VBox/log.h> diff --git a/src/VBox/Devices/Audio/alsa_stubs.c b/src/VBox/Devices/Audio/alsa_stubs.c index e2d62ae703e..4553fe14a18 100644 --- a/src/VBox/Devices/Audio/alsa_stubs.c +++ b/src/VBox/Devices/Audio/alsa_stubs.c @@ -18,7 +18,7 @@ #include <iprt/assert.h> #include <iprt/ldr.h> #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <alsa/asoundlib.h> diff --git a/src/VBox/Devices/Audio/pulse_stubs.c b/src/VBox/Devices/Audio/pulse_stubs.c index db752d7b301..fc098ea33d6 100644 --- a/src/VBox/Devices/Audio/pulse_stubs.c +++ b/src/VBox/Devices/Audio/pulse_stubs.c @@ -19,7 +19,7 @@ #include <iprt/assert.h> #include <iprt/ldr.h> #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <pulse/pulseaudio.h> diff --git a/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp b/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp index c8d123511ee..621a34a0192 100644 --- a/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp +++ b/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp @@ -19,7 +19,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/mem.h> #include <iprt/rand.h> diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp index 0fbe59d8d31..dd28d797ee0 100644 --- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp +++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp @@ -21,7 +21,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_DEV_VMSVGA #include <VBox/vmm/pdmdev.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp index a20ee45ec2d..688d9a97ed0 100644 --- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp +++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp @@ -22,7 +22,7 @@ #define LOG_GROUP LOG_GROUP_DEV_VMSVGA #include <VBox/vmm/pdmdev.h> #include <VBox/version.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <VBox/vmm/pgm.h> diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp index 7991abd79c6..e1ec3bc9143 100644 --- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp +++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp @@ -21,7 +21,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_DEV_VMSVGA #include <VBox/vmm/pdmdev.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp b/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp index e3784abf5f8..9179fce8c91 100644 --- a/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp +++ b/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp @@ -66,7 +66,7 @@ #include <iprt/string.h> #include <VBox/AssertGuest.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #define LOG_GROUP LOG_GROUP_HGSMI #include <VBox/log.h> #include <VBox/vmm/ssm.h> diff --git a/src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c b/src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c index e6047560fca..dd7c8354977 100644 --- a/src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c +++ b/src/VBox/Devices/Graphics/shaderlib/libWineStub/debug.c @@ -56,7 +56,7 @@ #ifdef VBOX_WITH_WDDM #include <VBoxDispMpLogger.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #else #include <iprt/log.h> #endif diff --git a/src/VBox/Devices/Graphics/shaderlib/shaderapi.c b/src/VBox/Devices/Graphics/shaderlib/shaderapi.c index 3d7fd1a0752..edcdfb58ca4 100644 --- a/src/VBox/Devices/Graphics/shaderlib/shaderapi.c +++ b/src/VBox/Devices/Graphics/shaderlib/shaderapi.c @@ -15,7 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/assert.h> #include <iprt/log.h> diff --git a/src/VBox/Devices/Graphics/shaderlib/utils.c b/src/VBox/Devices/Graphics/shaderlib/utils.c index 93d60b798d6..3a6d5935df3 100644 --- a/src/VBox/Devices/Graphics/shaderlib/utils.c +++ b/src/VBox/Devices/Graphics/shaderlib/utils.c @@ -15,7 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/assert.h> #ifdef _MSC_VER diff --git a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/libWineStub/debug.c b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/libWineStub/debug.c index a35bb3d4150..2514463672b 100644 --- a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/libWineStub/debug.c +++ b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/libWineStub/debug.c @@ -43,7 +43,7 @@ #ifdef VBOX_WITH_WDDM #include <VBoxDispMpLogger.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #else #include <iprt/log.h> #endif diff --git a/src/VBox/Devices/Network/DevE1000Phy.cpp b/src/VBox/Devices/Network/DevE1000Phy.cpp index 162c3c93596..f9c141c64a6 100644 --- a/src/VBox/Devices/Network/DevE1000Phy.cpp +++ b/src/VBox/Devices/Network/DevE1000Phy.cpp @@ -30,7 +30,7 @@ // #undef RT_STRICT // #endif -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <VBox/vmm/ssm.h> #include "DevE1000Phy.h" diff --git a/src/VBox/Devices/Network/Pcap.cpp b/src/VBox/Devices/Network/Pcap.cpp index bf241b917f6..04821714723 100644 --- a/src/VBox/Devices/Network/Pcap.cpp +++ b/src/VBox/Devices/Network/Pcap.cpp @@ -24,7 +24,7 @@ #include <iprt/file.h> #include <iprt/stream.h> #include <iprt/time.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/vmm/pdmnetinline.h> diff --git a/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp b/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp index 56a78cd4e09..bc8b0ce7be6 100644 --- a/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp +++ b/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp @@ -31,7 +31,7 @@ #define LOG_GROUP LOG_GROUP_DRV_NAT #include <iprt/cpp/lock.h> #include <iprt/timer.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> extern "C" { diff --git a/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c b/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c index b86fa3ba3b5..11c6fb918f6 100644 --- a/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c +++ b/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c @@ -19,7 +19,7 @@ #include <lwip/sys.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/string.h> #include <iprt/critsect.h> diff --git a/src/VBox/Devices/Network/slirp/bootp.c b/src/VBox/Devices/Network/slirp/bootp.c index b05722d16ca..331753a36e4 100644 --- a/src/VBox/Devices/Network/slirp/bootp.c +++ b/src/VBox/Devices/Network/slirp/bootp.c @@ -43,7 +43,7 @@ #include <slirp.h> #include <libslirp.h> -#include <iprt/err.h> +#include <iprt/errcore.h> /** Entry in the table of known DHCP clients. */ typedef struct diff --git a/src/VBox/Devices/Network/slirp/hostres.c b/src/VBox/Devices/Network/slirp/hostres.c index 1e68cc0e0fb..469cce7ac5d 100644 --- a/src/VBox/Devices/Network/slirp/hostres.c +++ b/src/VBox/Devices/Network/slirp/hostres.c @@ -20,7 +20,7 @@ #endif #include <iprt/assert.h> #include <iprt/ctype.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <slirp.h> #define isdigit(ch) RT_C_IS_DIGIT(ch) diff --git a/src/VBox/Devices/Network/slirp/ip_output.c b/src/VBox/Devices/Network/slirp/ip_output.c index ae81df99543..2c44789effe 100644 --- a/src/VBox/Devices/Network/slirp/ip_output.c +++ b/src/VBox/Devices/Network/slirp/ip_output.c @@ -62,7 +62,7 @@ */ #include <slirp.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include "alias.h" static const uint8_t broadcast_ethaddr[6] = diff --git a/src/VBox/Devices/Network/slirp/slirp_dns.c b/src/VBox/Devices/Network/slirp/slirp_dns.c index 3896d66b149..3f31cfb60b6 100644 --- a/src/VBox/Devices/Network/slirp/slirp_dns.c +++ b/src/VBox/Devices/Network/slirp/slirp_dns.c @@ -20,7 +20,7 @@ # include <paths.h> #endif -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/vmm/pdmdrv.h> #include <iprt/assert.h> #include <iprt/file.h> diff --git a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp index 526744e8bae..cc99cafc57b 100644 --- a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp +++ b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp @@ -24,7 +24,7 @@ #include <VBox/vmm/pdmnetinline.h> #include <VBox/sup.h> #include <VBox/vmm/vmm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/alloc.h> #include <iprt/path.h> diff --git a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp index 6d5b9b88102..dfefc5bbd9a 100644 --- a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp +++ b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp @@ -22,7 +22,7 @@ #define LOG_GROUP LOG_GROUP_MISC #include <VBox/vmm/pdmdev.h> #include <VBox/version.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/Devices/Storage/ATAPIPassthrough.cpp b/src/VBox/Devices/Storage/ATAPIPassthrough.cpp index 9ef0d371ce8..e8c626dc11a 100644 --- a/src/VBox/Devices/Storage/ATAPIPassthrough.cpp +++ b/src/VBox/Devices/Storage/ATAPIPassthrough.cpp @@ -21,7 +21,7 @@ #include <iprt/string.h> #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/cdefs.h> #include <VBox/scsi.h> #include <VBox/scsiinline.h> diff --git a/src/VBox/Devices/Storage/Debug.cpp b/src/VBox/Devices/Storage/Debug.cpp index 8fe3258e24f..647717317d9 100644 --- a/src/VBox/Devices/Storage/Debug.cpp +++ b/src/VBox/Devices/Storage/Debug.cpp @@ -17,7 +17,7 @@ #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/log.h> #include <iprt/types.h> #include <iprt/string.h> diff --git a/src/VBox/Devices/Storage/HBDMgmt-generic.cpp b/src/VBox/Devices/Storage/HBDMgmt-generic.cpp index e2a6d290a9a..bf16a478b76 100644 --- a/src/VBox/Devices/Storage/HBDMgmt-generic.cpp +++ b/src/VBox/Devices/Storage/HBDMgmt-generic.cpp @@ -15,7 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ #include <VBox/cdefs.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include "HBDMgmt.h" diff --git a/src/VBox/Devices/Storage/IOBufMgmt.cpp b/src/VBox/Devices/Storage/IOBufMgmt.cpp index 8955fc507ea..9cba14b02df 100644 --- a/src/VBox/Devices/Storage/IOBufMgmt.cpp +++ b/src/VBox/Devices/Storage/IOBufMgmt.cpp @@ -16,7 +16,7 @@ */ #define LOG_GROUP LOG_GROUP_IOBUFMGMT #include <VBox/cdefs.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/assert.h> #include <iprt/critsect.h> diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp index ad4bdbba7c3..83b168f738a 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp @@ -16,7 +16,7 @@ */ #define LOG_GROUP LOG_GROUP_VSCSI #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/types.h> #include <VBox/vscsi.h> #include <iprt/assert.h> diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp index 8eecdc5a8d5..a5abe7726c0 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp @@ -21,7 +21,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_VSCSI #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/types.h> #include <VBox/vscsi.h> #include <iprt/cdefs.h> diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILunSsc.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILunSsc.cpp index 095dc7fafb9..5f4e5a85f87 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSILunSsc.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSILunSsc.cpp @@ -21,7 +21,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_VSCSI #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/types.h> #include <VBox/vscsi.h> #include <iprt/assert.h> diff --git a/src/VBox/Devices/USB/VUSBSniffer.cpp b/src/VBox/Devices/USB/VUSBSniffer.cpp index 6e3d5019e40..3d15503bf69 100644 --- a/src/VBox/Devices/USB/VUSBSniffer.cpp +++ b/src/VBox/Devices/USB/VUSBSniffer.cpp @@ -22,7 +22,7 @@ #define LOG_GROUP LOG_GROUP_DRV_VUSB #include <VBox/log.h> #include <iprt/file.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/path.h> #include <iprt/mem.h> #include <iprt/string.h> diff --git a/src/VBox/Devices/USB/VUSBSnifferPcapNg.cpp b/src/VBox/Devices/USB/VUSBSnifferPcapNg.cpp index 68fa5a21dd7..4abea848fc3 100644 --- a/src/VBox/Devices/USB/VUSBSnifferPcapNg.cpp +++ b/src/VBox/Devices/USB/VUSBSnifferPcapNg.cpp @@ -22,7 +22,7 @@ #define LOG_GROUP LOG_GROUP_DRV_VUSB #include <VBox/log.h> #include <iprt/buildconfig.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/string.h> #include <iprt/system.h> diff --git a/src/VBox/Devices/USB/VUSBUrbPool.cpp b/src/VBox/Devices/USB/VUSBUrbPool.cpp index 6dca31caee6..3fed6293b6f 100644 --- a/src/VBox/Devices/USB/VUSBUrbPool.cpp +++ b/src/VBox/Devices/USB/VUSBUrbPool.cpp @@ -21,7 +21,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_DRV_VUSB #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/critsect.h> diff --git a/src/VBox/Devices/USB/VUSBUrbTrace.cpp b/src/VBox/Devices/USB/VUSBUrbTrace.cpp index 4a28dc23ccd..305559767eb 100644 --- a/src/VBox/Devices/USB/VUSBUrbTrace.cpp +++ b/src/VBox/Devices/USB/VUSBUrbTrace.cpp @@ -22,7 +22,7 @@ #define LOG_GROUP LOG_GROUP_DRV_VUSB #include <VBox/vmm/pdm.h> #include <VBox/vmm/vmapi.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/alloc.h> #include <VBox/log.h> #include <iprt/time.h> diff --git a/src/VBox/Devices/build/VBoxDD.cpp b/src/VBox/Devices/build/VBoxDD.cpp index dcb436a87f5..19e86453bb9 100644 --- a/src/VBox/Devices/build/VBoxDD.cpp +++ b/src/VBox/Devices/build/VBoxDD.cpp @@ -22,7 +22,7 @@ #define LOG_GROUP LOG_GROUP_DEV #include <VBox/vmm/pdm.h> #include <VBox/version.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/usb.h> #include <VBox/log.h> diff --git a/src/VBox/Devices/build/VBoxDD2.cpp b/src/VBox/Devices/build/VBoxDD2.cpp index 0ab0f45b72d..83a277aa995 100644 --- a/src/VBox/Devices/build/VBoxDD2.cpp +++ b/src/VBox/Devices/build/VBoxDD2.cpp @@ -24,7 +24,7 @@ #define LOG_GROUP LOG_GROUP_DEV #include <VBox/vmm/pdm.h> #include <VBox/version.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/assert.h> diff --git a/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp b/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp index 20100ede460..f0d68afd946 100644 --- a/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp +++ b/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp @@ -34,7 +34,7 @@ *********************************************************************************************************************************/ #include <VBox/ExtPack/ExtPack.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/version.h> #include <iprt/string.h> #include <iprt/param.h> diff --git a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp index da1a480fa76..5d338d4ed03 100644 --- a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp +++ b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp @@ -34,7 +34,7 @@ *********************************************************************************************************************************/ #include <VBox/ExtPack/ExtPack.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/version.h> #include <iprt/string.h> #include <iprt/param.h> diff --git a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMainVM.cpp b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMainVM.cpp index 4798ffdd79a..61dc416c8d3 100644 --- a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMainVM.cpp +++ b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMainVM.cpp @@ -34,7 +34,7 @@ *********************************************************************************************************************************/ #include <VBox/ExtPack/ExtPack.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/version.h> #include <VBox/vmm/cfgm.h> #include <iprt/string.h> diff --git a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp index 4761905255d..c3047f4284e 100644 --- a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp +++ b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp @@ -34,7 +34,7 @@ *********************************************************************************************************************************/ #include <VBox/ExtPack/ExtPack.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/version.h> #include <iprt/string.h> #include <iprt/param.h> diff --git a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp index eab59502be6..269e87c8eb8 100644 --- a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp +++ b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp @@ -37,7 +37,7 @@ #include <iprt/thread.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/RemoteDesktop/VRDEOrders.h> #include <VBox/RemoteDesktop/VRDE.h> diff --git a/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp b/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp index d7d0f75b1ac..ab250c0f2c6 100644 --- a/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp +++ b/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp @@ -21,7 +21,7 @@ *********************************************************************************************************************************/ #include <VBox/ExtPack/ExtPack.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/version.h> #include <iprt/string.h> #include <iprt/param.h> diff --git a/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp b/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp index e719b1c26a8..3747356e8be 100644 --- a/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp +++ b/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp @@ -30,7 +30,7 @@ #include <VBox/com/listeners.h> #include <VBox/com/VirtualBox.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <VBox/version.h> diff --git a/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp b/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp index b3d97aa3bbc..dd58b726b01 100644 --- a/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp +++ b/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp @@ -35,7 +35,7 @@ #include <VBox/log.h> #include <VBox/version.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/mem.h> #include <iprt/getopt.h> diff --git a/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStart.cpp b/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStart.cpp index c479acbfc51..c64e9631800 100644 --- a/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStart.cpp +++ b/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStart.cpp @@ -22,7 +22,7 @@ #include <VBox/com/ErrorInfo.h> #include <VBox/com/errorprint.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/log.h> #include <iprt/message.h> #include <iprt/stream.h> diff --git a/src/VBox/Frontends/VBoxSDL/Helper.cpp b/src/VBox/Frontends/VBoxSDL/Helper.cpp index 48353ee4c51..6225afebd7e 100644 --- a/src/VBox/Frontends/VBoxSDL/Helper.cpp +++ b/src/VBox/Frontends/VBoxSDL/Helper.cpp @@ -18,7 +18,7 @@ */ #define LOG_GROUP LOG_GROUP_GUI -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/asm.h> #include <iprt/assert.h> diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c index a2c39e7712b..daf225652fe 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c @@ -8,7 +8,7 @@ #include "cr_error.h" #include "cr_mem.h" #include "cr_pixeldata.h" -#include <iprt/err.h> +#include <iprt/errcore.h> #include <stdio.h> void crStateDiffContext( CRContext *from, CRContext *to ) diff --git a/src/VBox/GuestHost/OpenGL/util/blitter.cpp b/src/VBox/GuestHost/OpenGL/util/blitter.cpp index da69218c010..89603936eec 100644 --- a/src/VBox/GuestHost/OpenGL/util/blitter.cpp +++ b/src/VBox/GuestHost/OpenGL/util/blitter.cpp @@ -39,7 +39,7 @@ DECLINLINE(void) crWarning(const char *format, ... ) {} # include "cr_bmpscale.h" #endif -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> diff --git a/src/VBox/GuestHost/OpenGL/util/dll.c b/src/VBox/GuestHost/OpenGL/util/dll.c index 9d217b77c66..b76c1558938 100644 --- a/src/VBox/GuestHost/OpenGL/util/dll.c +++ b/src/VBox/GuestHost/OpenGL/util/dll.c @@ -16,7 +16,7 @@ #if defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(DARWIN) || defined(SunOS) || defined(OSF1) # include <iprt/assert.h> -# include <iprt/err.h> +# include <iprt/errcore.h> # include <iprt/log.h> # include <iprt/path.h> #include <dlfcn.h> diff --git a/src/VBox/GuestHost/OpenGL/util/htable.cpp b/src/VBox/GuestHost/OpenGL/util/htable.cpp index 5f6feef5fca..6c8f1000d9e 100644 --- a/src/VBox/GuestHost/OpenGL/util/htable.cpp +++ b/src/VBox/GuestHost/OpenGL/util/htable.cpp @@ -34,7 +34,7 @@ #include <iprt/cdefs.h> #include <iprt/types.h> #include <iprt/mem.h> -#include <iprt/err.h> +#include <iprt/errcore.h> VBOXHTABLEDECL(int) CrHTableCreate(PCRHTABLE pTbl, uint32_t cSize) { diff --git a/src/VBox/GuestHost/OpenGL/util/vreg.cpp b/src/VBox/GuestHost/OpenGL/util/vreg.cpp index 0df3ad30b10..188e3c888d2 100644 --- a/src/VBox/GuestHost/OpenGL/util/vreg.cpp +++ b/src/VBox/GuestHost/OpenGL/util/vreg.cpp @@ -27,7 +27,7 @@ # include <cr_error.h> #endif -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <iprt/asm.h> diff --git a/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp b/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp index 2dbf20ef4d8..bcefece831a 100644 --- a/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp +++ b/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp @@ -19,7 +19,7 @@ #include <iprt/alloc.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <VBox/GuestHost/clipboard-helper.h> diff --git a/src/VBox/HostDrivers/Support/SUPDrvSem.cpp b/src/VBox/HostDrivers/Support/SUPDrvSem.cpp index 1aeef558e77..129188e7770 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvSem.cpp +++ b/src/VBox/HostDrivers/Support/SUPDrvSem.cpp @@ -47,7 +47,7 @@ #include <VBox/param.h> #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> /** diff --git a/src/VBox/HostDrivers/Support/SUPLibSem.cpp b/src/VBox/HostDrivers/Support/SUPLibSem.cpp index e28a2fea341..84c2e6e9166 100644 --- a/src/VBox/HostDrivers/Support/SUPLibSem.cpp +++ b/src/VBox/HostDrivers/Support/SUPLibSem.cpp @@ -31,7 +31,7 @@ #define LOG_GROUP LOG_GROUP_SUP #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/param.h> #include <iprt/assert.h> diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c index 7bc2b7f2ce2..5db5870b5d6 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c index 029cc6c5e49..7b089671fd0 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> /** diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c index 46333d0793d..4cc5130aa00 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp index 37f2df220e7..40422489bd3 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_SUP #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/string.h> #include <iprt/stdarg.h> diff --git a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp index 743145159eb..3a1240ce849 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include "SUPSvcInternal.h" -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> diff --git a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp index 8670e40baff..1e31d11ccf2 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp @@ -33,7 +33,7 @@ #include <VBox/log.h> #include <iprt/asm.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <iprt/critsect.h> #include <iprt/mem.h> diff --git a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c index 3ee0cfca66a..47d88769577 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c +++ b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "../SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq) diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c index b8db6c688c4..20589e0d608 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c +++ b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "../SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq) diff --git a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c index e3476a99389..f94ac76b3e7 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c +++ b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "../SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq) diff --git a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c index 368080e6ca4..6bea21b7db7 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c +++ b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "../SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq) diff --git a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c index 6b06a5b1882..f33e7a98371 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c +++ b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "../SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> int VBOXCALL supR0IdcNativeOpen(PSUPDRVIDCHANDLE pHandle, PSUPDRVIDCREQCONNECT pReq) diff --git a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp index 05f2db483ed..40ac8fad4e8 100644 --- a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp +++ b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp @@ -35,7 +35,7 @@ #include <iprt/stream.h> #include <iprt/string.h> #include <iprt/ctype.h> -#include <iprt/err.h> +#include <iprt/errcore.h> /** diff --git a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp index 24cfe07dd52..b5ba40ecfb3 100644 --- a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp +++ b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/stream.h> #include <iprt/message.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp index 09b5b44ebcd..4e4df5d1352 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/param.h> #include <iprt/asm.h> #include <iprt/assert.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp index f7a63a77c74..6e5f6a6b42e 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/stream.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp index 9085bbe93d9..e2857dc0497 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/stream.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp index 2fc9456b777..e86ccef5866 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp @@ -32,7 +32,7 @@ #include <VBox/vmm/vm.h> #include <VBox/vmm/vmm.h> #include <VBox/vmm/gvmm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/param.h> #include <iprt/asm-amd64-x86.h> #include <iprt/initterm.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp index 57142ebde56..931837fc09b 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include <VBox/sup.h> #include <VBox/param.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/stream.h> #include <iprt/string.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp index b881c32ac98..532aeefedcd 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include <VBox/sup.h> #include <VBox/param.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/stream.h> #include <iprt/thread.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp index e5f4582c75d..e776b540368 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/getopt.h> #include <iprt/initterm.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp index 5e0572fc6bb..b2bd96b8752 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp @@ -32,7 +32,7 @@ #include <VBox/param.h> #include <iprt/env.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/process.h> #include <iprt/stream.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp index aac84b479e0..c409bec904e 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <iprt/stream.h> #include <iprt/string.h> diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp index 53b916a0127..274c4c890db 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupVerify.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/getopt.h> #include <iprt/initterm.h> diff --git a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c index ffc0d03fdfc..de055d350ee 100644 --- a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c +++ b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include "../SUPR0IdcClientInternal.h" -#include <VBox/err.h> +#include <iprt/errcore.h> /********************************************************************************************************************************* diff --git a/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp b/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp index f27acd07515..8598edf0add 100644 --- a/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp @@ -36,7 +36,7 @@ #endif #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <iprt/ctype.h> #include <iprt/heap.h> diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c index 6cf75affd6d..da881d283ef 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c @@ -56,7 +56,7 @@ #define LOG_GROUP LOG_GROUP_NET_ADP_DRV #include <VBox/version.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/initterm.h> #include <iprt/string.h> @@ -65,7 +65,7 @@ #include <iprt/assert.h> #include <iprt/uuid.h> #include <iprt/alloc.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #define VBOXNETADP_OS_SPECFIC 1 #include "../VBoxNetAdpInternal.h" diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c index 16d89966238..f2ea60e290a 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c @@ -39,7 +39,7 @@ #define LOG_GROUP LOG_GROUP_NET_ADP_DRV #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/process.h> #include <iprt/initterm.h> #include <iprt/mem.h> diff --git a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c index e4df60bbd29..80b5c47feed 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_NET_ADP_DRV #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/version.h> #include <iprt/assert.h> #include <iprt/semaphore.h> diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp index 740cf9a9522..ecef37578e1 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/usblib.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include "VBoxUSBInterface.h" diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp index 5c39cadfea6..ab9254e9f9c 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp @@ -50,7 +50,7 @@ #include <iprt/semaphore.h> #include <iprt/process.h> #include <iprt/alloc.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> #include <mach/kmod.h> diff --git a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp index f6c016184a2..05481ff2a00 100644 --- a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/usbfilter.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/stream.h> diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp index bb106e118fa..ced7487e8a6 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp @@ -32,13 +32,13 @@ #include <iprt/win/setupapi.h> #include <newdev.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/param.h> #include <iprt/path.h> #include <iprt/stream.h> #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <stdio.h> #include <VBox/VBoxDrvCfg-win.h> diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp index fafcaaf958e..17fea102a9c 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp @@ -33,11 +33,11 @@ #include <newdev.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/param.h> #include <iprt/path.h> #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/VBoxDrvCfg-win.h> #include <stdio.h> diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp index 08dffb8b6bf..7eeca62dfc1 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp @@ -34,7 +34,7 @@ #include <VBox/types.h> #include <iprt/process.h> #include <iprt/assert.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp index f4c0824c2c4..a7456302d9c 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include "VBoxUsbMon.h" #include "../cmn/VBoxUsbIdc.h" -#include <vbox/err.h> +#include <iprt/errcore.h> #include <VBox/usblib.h> #include <excpt.h> diff --git a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp index f2e039d26b6..42ca2bde439 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp +++ b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp @@ -26,7 +26,7 @@ #include <iprt/assert.h> #include <iprt/mem.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/utf16.h> #include "VBox/log.h" diff --git a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp index 5050fe1cb14..9ba5235086f 100644 --- a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp +++ b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp @@ -17,7 +17,7 @@ #include <iprt/assert.h> #include <iprt/buildconfig.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/getopt.h> #include <iprt/initterm.h> #include <iprt/stream.h> diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_state.c b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_state.c index 00d27f7a144..49c901a1cc1 100644 --- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_state.c +++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_state.c @@ -21,7 +21,7 @@ #include "dlm_generated.h" #include "VBox/vmm/ssm.h" -#include "iprt/err.h" +#include <iprt/errcore.h> typedef struct { diff --git a/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp b/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp index 3f0796768ef..200f28c5c49 100644 --- a/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp +++ b/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp @@ -20,7 +20,7 @@ #include <VBox/vd.h> #include <VBox/vd-ifs.h> #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/com/ErrorInfo.h> #include <VBox/com/NativeEventQueue.h> #include <VBox/com/com.h> diff --git a/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp b/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp index 4bf5a208d69..ecac186731a 100644 --- a/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp +++ b/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp @@ -25,7 +25,7 @@ #include <iprt/win/windows.h> #include <Wincrypt.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/message.h> #include <iprt/string.h> #include <iprt/utf16.h> diff --git a/src/VBox/Main/glue/AutoLock.cpp b/src/VBox/Main/glue/AutoLock.cpp index 13099181314..1fa47534b95 100644 --- a/src/VBox/Main/glue/AutoLock.cpp +++ b/src/VBox/Main/glue/AutoLock.cpp @@ -30,7 +30,7 @@ #include <iprt/thread.h> #include <iprt/semaphore.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #if defined(RT_LOCK_STRICT) diff --git a/src/VBox/Main/glue/ErrorInfo.cpp b/src/VBox/Main/glue/ErrorInfo.cpp index 53e9887ab21..5809ed2fbe8 100644 --- a/src/VBox/Main/glue/ErrorInfo.cpp +++ b/src/VBox/Main/glue/ErrorInfo.cpp @@ -32,7 +32,7 @@ #include <iprt/stream.h> #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> namespace com { diff --git a/src/VBox/Main/glue/VBoxLogRelCreate.cpp b/src/VBox/Main/glue/VBoxLogRelCreate.cpp index e8b33964157..fe667998de4 100644 --- a/src/VBox/Main/glue/VBoxLogRelCreate.cpp +++ b/src/VBox/Main/glue/VBoxLogRelCreate.cpp @@ -28,7 +28,7 @@ #include <iprt/process.h> #include <iprt/time.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <VBox/version.h> #include "package-generated.h" diff --git a/src/VBox/Main/glue/com.cpp b/src/VBox/Main/glue/com.cpp index cb3d2162b6e..204d0788310 100644 --- a/src/VBox/Main/glue/com.cpp +++ b/src/VBox/Main/glue/com.cpp @@ -45,7 +45,7 @@ #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> diff --git a/src/VBox/Main/src-all/EventImpl.cpp b/src/VBox/Main/src-all/EventImpl.cpp index 2fce6828e7d..c05ed24cecc 100644 --- a/src/VBox/Main/src-all/EventImpl.cpp +++ b/src/VBox/Main/src-all/EventImpl.cpp @@ -59,7 +59,7 @@ #include <iprt/asm.h> #include <iprt/critsect.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/semaphore.h> #include <iprt/time.h> diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp index efc3ca958ba..f3f00745ecb 100644 --- a/src/VBox/Main/src-all/Global.cpp +++ b/src/VBox/Main/src-all/Global.cpp @@ -21,7 +21,7 @@ #include <iprt/assert.h> #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> /* static */ const Global::OSType Global::sOSTypes[] = diff --git a/src/VBox/Main/src-all/ProgressImpl.cpp b/src/VBox/Main/src-all/ProgressImpl.cpp index 597709fa0f9..7629d22669a 100644 --- a/src/VBox/Main/src-all/ProgressImpl.cpp +++ b/src/VBox/Main/src-all/ProgressImpl.cpp @@ -38,7 +38,7 @@ #include <iprt/semaphore.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include "AutoCaller.h" #include "VBoxEvents.h" diff --git a/src/VBox/Main/src-all/QMTranslatorImpl.cpp b/src/VBox/Main/src-all/QMTranslatorImpl.cpp index ab0324a0ab9..e63953a8663 100644 --- a/src/VBox/Main/src-all/QMTranslatorImpl.cpp +++ b/src/VBox/Main/src-all/QMTranslatorImpl.cpp @@ -19,7 +19,7 @@ #include <set> #include <algorithm> #include <iterator> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/file.h> #include <iprt/asm.h> #include <VBox/com/string.h> diff --git a/src/VBox/Main/src-all/ThreadTask.cpp b/src/VBox/Main/src-all/ThreadTask.cpp index 8c1be390067..d9eae996969 100644 --- a/src/VBox/Main/src-all/ThreadTask.cpp +++ b/src/VBox/Main/src-all/ThreadTask.cpp @@ -15,7 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/thread.h> #include "VirtualBoxBase.h" diff --git a/src/VBox/Main/src-client/EBMLWriter.cpp b/src/VBox/Main/src-client/EBMLWriter.cpp index 1192d75973c..f5d09170f41 100644 --- a/src/VBox/Main/src-client/EBMLWriter.cpp +++ b/src/VBox/Main/src-client/EBMLWriter.cpp @@ -38,7 +38,7 @@ #include <iprt/buildconfig.h> #include <iprt/cdefs.h> #include <iprt/critsect.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/file.h> #include <iprt/rand.h> #include <iprt/string.h> diff --git a/src/VBox/Main/src-client/HGCMObjects.cpp b/src/VBox/Main/src-client/HGCMObjects.cpp index 0b1acf5e9c6..909b8cf3dee 100644 --- a/src/VBox/Main/src-client/HGCMObjects.cpp +++ b/src/VBox/Main/src-client/HGCMObjects.cpp @@ -21,7 +21,7 @@ #include "HGCMObjects.h" #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> static RTCRITSECT g_critsect; diff --git a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp index 91179f8660d..f8fe30c3d1a 100644 --- a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp +++ b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp @@ -24,7 +24,7 @@ #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/RemoteDesktop/VRDE.h> #include <VBox/vrdpusb.h> diff --git a/src/VBox/Main/src-client/SessionImpl.cpp b/src/VBox/Main/src-client/SessionImpl.cpp index cced6a6dd20..5440451ba92 100644 --- a/src/VBox/Main/src-client/SessionImpl.cpp +++ b/src/VBox/Main/src-client/SessionImpl.cpp @@ -25,7 +25,7 @@ #include "AutoCaller.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/process.h> diff --git a/src/VBox/Main/src-client/WebMWriter.cpp b/src/VBox/Main/src-client/WebMWriter.cpp index b17b2c23f60..385d27b9cc6 100644 --- a/src/VBox/Main/src-client/WebMWriter.cpp +++ b/src/VBox/Main/src-client/WebMWriter.cpp @@ -35,7 +35,7 @@ #include <iprt/buildconfig.h> #include <iprt/cdefs.h> #include <iprt/critsect.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/file.h> #include <iprt/rand.h> #include <iprt/string.h> diff --git a/src/VBox/Main/src-global/win/VBoxSDS.cpp b/src/VBox/Main/src-global/win/VBoxSDS.cpp index 67cddf2d390..bf00259e28d 100644 --- a/src/VBox/Main/src-global/win/VBoxSDS.cpp +++ b/src/VBox/Main/src-global/win/VBoxSDS.cpp @@ -88,7 +88,7 @@ #include "VirtualBoxSDSImpl.h" #include "Logging.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> #include <iprt/buildconfig.h> #include <iprt/dir.h> diff --git a/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp b/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp index 0ca0f400d7f..050f370ff94 100644 --- a/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp +++ b/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp @@ -25,7 +25,7 @@ #include "AutoCaller.h" #include "Logging.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> #include <iprt/critsect.h> #include <iprt/mem.h> diff --git a/src/VBox/Main/src-server/DataStreamImpl.cpp b/src/VBox/Main/src-server/DataStreamImpl.cpp index 89032a602de..2717ae55026 100644 --- a/src/VBox/Main/src-server/DataStreamImpl.cpp +++ b/src/VBox/Main/src-server/DataStreamImpl.cpp @@ -24,7 +24,7 @@ #include "AutoCaller.h" #include "Logging.h" -#include "iprt/err.h" +#include <iprt/errcore.h> /********************************************************************************************************************************* diff --git a/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp b/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp index 4be7098365e..6106616bbcc 100644 --- a/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp +++ b/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp @@ -32,7 +32,7 @@ typedef int socklen_t; #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/file.h> #include <iprt/critsect.h> diff --git a/src/VBox/Main/src-server/Matching.cpp b/src/VBox/Main/src-server/Matching.cpp index 0e3daf72199..e88280d09ed 100644 --- a/src/VBox/Main/src-server/Matching.cpp +++ b/src/VBox/Main/src-server/Matching.cpp @@ -23,7 +23,7 @@ #include <stdlib.h> -#include <iprt/err.h> +#include <iprt/errcore.h> namespace matching { diff --git a/src/VBox/Main/src-server/NATEngineImpl.cpp b/src/VBox/Main/src-server/NATEngineImpl.cpp index ea44c8cbd6a..c2e14d2983c 100644 --- a/src/VBox/Main/src-server/NATEngineImpl.cpp +++ b/src/VBox/Main/src-server/NATEngineImpl.cpp @@ -23,7 +23,7 @@ #include <iprt/string.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/settings.h> #include <VBox/com/array.h> diff --git a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp index 5ef1db95ea6..14f4795cc1b 100644 --- a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp +++ b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp @@ -29,7 +29,7 @@ #include <iprt/string.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/settings.h> #include "AutoStateDep.h" diff --git a/src/VBox/Main/src-server/Performance.cpp b/src/VBox/Main/src-server/Performance.cpp index 48f7e72bcfb..ac6665fbe9f 100644 --- a/src/VBox/Main/src-server/Performance.cpp +++ b/src/VBox/Main/src-server/Performance.cpp @@ -34,7 +34,7 @@ #include <VBox/com/array.h> #include <VBox/com/ptr.h> #include <VBox/com/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/mem.h> #include <iprt/cpuset.h> diff --git a/src/VBox/Main/src-server/ProgressProxyImpl.cpp b/src/VBox/Main/src-server/ProgressProxyImpl.cpp index e9586446c47..f8ae1b4a99b 100644 --- a/src/VBox/Main/src-server/ProgressProxyImpl.cpp +++ b/src/VBox/Main/src-server/ProgressProxyImpl.cpp @@ -27,7 +27,7 @@ #include <iprt/time.h> #include <iprt/semaphore.h> -#include <VBox/err.h> +#include <iprt/errcore.h> //////////////////////////////////////////////////////////////////////////////// // ProgressProxy class diff --git a/src/VBox/Main/src-server/SnapshotImpl.cpp b/src/VBox/Main/src-server/SnapshotImpl.cpp index 37963b05838..61d4a16270b 100644 --- a/src/VBox/Main/src-server/SnapshotImpl.cpp +++ b/src/VBox/Main/src-server/SnapshotImpl.cpp @@ -41,7 +41,7 @@ #include <iprt/cpp/utils.h> #include <VBox/param.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/settings.h> diff --git a/src/VBox/Main/src-server/StorageControllerImpl.cpp b/src/VBox/Main/src-server/StorageControllerImpl.cpp index ed1a78c71ca..55bf61fdd48 100644 --- a/src/VBox/Main/src-server/StorageControllerImpl.cpp +++ b/src/VBox/Main/src-server/StorageControllerImpl.cpp @@ -25,7 +25,7 @@ #include <iprt/string.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/settings.h> #include <algorithm> diff --git a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp index 24c38b205a8..db3de2624f9 100644 --- a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp +++ b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp @@ -36,7 +36,7 @@ #include <iprt/uri.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/param.h> #include <VBox/settings.h> #include <VBox/vd.h> diff --git a/src/VBox/Main/src-server/USBControllerImpl.cpp b/src/VBox/Main/src-server/USBControllerImpl.cpp index e3a7eba10f6..66d322135be 100644 --- a/src/VBox/Main/src-server/USBControllerImpl.cpp +++ b/src/VBox/Main/src-server/USBControllerImpl.cpp @@ -25,7 +25,7 @@ #include <iprt/string.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/settings.h> #include <VBox/com/array.h> diff --git a/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp b/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp index 062f1f4dbc5..81dee4be9fd 100644 --- a/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp +++ b/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp @@ -31,7 +31,7 @@ #include <iprt/string.h> #include <iprt/cpp/utils.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/settings.h> #include <VBox/com/array.h> diff --git a/src/VBox/Main/src-server/USBProxyBackend.cpp b/src/VBox/Main/src-server/USBProxyBackend.cpp index 8d317b21e11..1517dab8bd7 100644 --- a/src/VBox/Main/src-server/USBProxyBackend.cpp +++ b/src/VBox/Main/src-server/USBProxyBackend.cpp @@ -26,7 +26,7 @@ #include "Logging.h" #include <VBox/com/array.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> #include <iprt/semaphore.h> #include <iprt/thread.h> diff --git a/src/VBox/Main/src-server/USBProxyService.cpp b/src/VBox/Main/src-server/USBProxyService.cpp index 20ab9fbdf77..f55c1c1e599 100644 --- a/src/VBox/Main/src-server/USBProxyService.cpp +++ b/src/VBox/Main/src-server/USBProxyService.cpp @@ -25,7 +25,7 @@ #include "Logging.h" #include <VBox/com/array.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> #include <iprt/semaphore.h> #include <iprt/thread.h> diff --git a/src/VBox/Main/src-server/UnattendedScript.cpp b/src/VBox/Main/src-server/UnattendedScript.cpp index 0e5200fddbe..1899163720a 100644 --- a/src/VBox/Main/src-server/UnattendedScript.cpp +++ b/src/VBox/Main/src-server/UnattendedScript.cpp @@ -28,7 +28,7 @@ #include "UnattendedScript.h" #include "UnattendedImpl.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/ctype.h> #include <iprt/file.h> diff --git a/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp b/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp index 0d0b05307b5..047355b940a 100644 --- a/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp @@ -19,7 +19,7 @@ #include <VBox/com/ptr.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/thread.h> #include <iprt/semaphore.h> diff --git a/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp b/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp index 7c7b9be6761..a66062800f0 100644 --- a/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp @@ -17,7 +17,7 @@ #include "HostPower.h" #include "Logging.h" -#include "iprt/err.h" +#include <iprt/errcore.h> #include <IOKit/IOMessage.h> #include <IOKit/ps/IOPowerSources.h> diff --git a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp index 111ae9d4044..b223a85c2ea 100644 --- a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp +++ b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp @@ -31,7 +31,7 @@ #define LOG_GROUP LOG_GROUP_MAIN -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/alloc.h> #include <string.h> diff --git a/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp b/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp index ece87f4fbd4..c10616c265c 100644 --- a/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp @@ -22,7 +22,7 @@ #include <mach/vm_statistics.h> #include <sys/sysctl.h> #include <sys/errno.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/log.h> #include <iprt/mp.h> #include <iprt/param.h> diff --git a/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp b/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp index 9f63590df19..283e7f222f5 100644 --- a/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp @@ -25,13 +25,13 @@ #include <VBox/usb.h> #include <VBox/usblib.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/alloc.h> #include <iprt/assert.h> #include <iprt/file.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/asm.h> diff --git a/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp b/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp index fb6073e597e..5e2b1b956ad 100644 --- a/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp +++ b/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp @@ -24,13 +24,13 @@ #include <VBox/usb.h> #include <VBox/usblib.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/alloc.h> #include <iprt/assert.h> #include <iprt/file.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/param.h> #include <iprt/path.h> diff --git a/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp b/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp index 9f83ad1d680..147b60be051 100644 --- a/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp +++ b/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp @@ -16,7 +16,7 @@ */ #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/file.h> #include <iprt/log.h> diff --git a/src/VBox/Main/src-server/linux/NetIf-linux.cpp b/src/VBox/Main/src-server/linux/NetIf-linux.cpp index fe7051bd042..3872cabf313 100644 --- a/src/VBox/Main/src-server/linux/NetIf-linux.cpp +++ b/src/VBox/Main/src-server/linux/NetIf-linux.cpp @@ -22,7 +22,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_MAIN -#include <iprt/err.h> +#include <iprt/errcore.h> #include <list> #include <sys/ioctl.h> #include <sys/socket.h> diff --git a/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp b/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp index 59dc9eafda7..159268381d9 100644 --- a/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp +++ b/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp @@ -25,7 +25,7 @@ #include <VBox/usb.h> #include <VBox/usblib.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/alloc.h> @@ -34,7 +34,7 @@ #include <iprt/dir.h> #include <iprt/env.h> #include <iprt/file.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/param.h> #include <iprt/path.h> diff --git a/src/VBox/Main/src-server/linux/vbox-libhal.cpp b/src/VBox/Main/src-server/linux/vbox-libhal.cpp index d56aa591c92..9fb06562b84 100644 --- a/src/VBox/Main/src-server/linux/vbox-libhal.cpp +++ b/src/VBox/Main/src-server/linux/vbox-libhal.cpp @@ -19,7 +19,7 @@ #include "vbox-libhal.h" -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/ldr.h> /** diff --git a/src/VBox/Main/src-server/os2/NetIf-os2.cpp b/src/VBox/Main/src-server/os2/NetIf-os2.cpp index d070a9521a9..11aec3225ca 100644 --- a/src/VBox/Main/src-server/os2/NetIf-os2.cpp +++ b/src/VBox/Main/src-server/os2/NetIf-os2.cpp @@ -22,7 +22,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_MAIN -#include <iprt/err.h> +#include <iprt/errcore.h> #include <list> #include "HostNetworkInterfaceImpl.h" diff --git a/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp b/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp index def3ef63372..8ebf059645e 100644 --- a/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp +++ b/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp @@ -25,13 +25,13 @@ #include "Logging.h" #include <VBox/usb.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/alloc.h> #include <iprt/assert.h> #include <iprt/file.h> -#include <iprt/err.h> +#include <iprt/errcore.h> /** diff --git a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp index 2cae3c98438..3f7abfe56a1 100644 --- a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp @@ -17,7 +17,7 @@ #include "DynLoadLibSolaris.h" -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/ldr.h> diff --git a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp index 52e1d180b1f..0a3a2577568 100644 --- a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp +++ b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp @@ -22,7 +22,7 @@ *********************************************************************************************************************************/ #define LOG_GROUP LOG_GROUP_MAIN -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/ctype.h> #include <iprt/mem.h> #include <iprt/path.h> diff --git a/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp b/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp index ffab0dd7602..d04f8ca200f 100644 --- a/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp @@ -24,7 +24,7 @@ #include <VBox/usb.h> #include <VBox/usblib.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/semaphore.h> #include <iprt/path.h> diff --git a/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp b/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp index f1b2170622d..8e74157c5dd 100644 --- a/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp +++ b/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp @@ -28,7 +28,7 @@ #include <VBox/com/ptr.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/win/windows.h> diff --git a/src/VBox/Main/src-server/win/HostPowerWin.cpp b/src/VBox/Main/src-server/win/HostPowerWin.cpp index 4b6d28ee497..2114e29729e 100644 --- a/src/VBox/Main/src-server/win/HostPowerWin.cpp +++ b/src/VBox/Main/src-server/win/HostPowerWin.cpp @@ -28,7 +28,7 @@ extern "C" { } #include <VBox/com/ptr.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include "HostPower.h" #include "Logging.h" diff --git a/src/VBox/Main/src-server/win/NetIf-win.cpp b/src/VBox/Main/src-server/win/NetIf-win.cpp index c8262689c3c..5b163f0ccf9 100644 --- a/src/VBox/Main/src-server/win/NetIf-win.cpp +++ b/src/VBox/Main/src-server/win/NetIf-win.cpp @@ -24,7 +24,7 @@ #define NETIF_WITHOUT_NETCFG -#include <iprt/err.h> +#include <iprt/errcore.h> #include <list> #define _WIN32_DCOM diff --git a/src/VBox/Main/src-server/win/PerformanceWin.cpp b/src/VBox/Main/src-server/win/PerformanceWin.cpp index 3cefe435936..2a98db5fa44 100644 --- a/src/VBox/Main/src-server/win/PerformanceWin.cpp +++ b/src/VBox/Main/src-server/win/PerformanceWin.cpp @@ -32,7 +32,7 @@ extern "C" { #include <powrprof.h> } -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/ldr.h> #include <iprt/mp.h> #include <iprt/mem.h> diff --git a/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp b/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp index 723a25e8675..42260adea95 100644 --- a/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp +++ b/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp @@ -23,13 +23,13 @@ #include "Logging.h" #include <VBox/usb.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/alloc.h> #include <iprt/assert.h> #include <iprt/file.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/usblib.h> diff --git a/src/VBox/Main/src-server/win/svchlp.cpp b/src/VBox/Main/src-server/win/svchlp.cpp index 1ddded7d2c8..c5c7e093a5e 100644 --- a/src/VBox/Main/src-server/win/svchlp.cpp +++ b/src/VBox/Main/src-server/win/svchlp.cpp @@ -20,7 +20,7 @@ //#include "HostImpl.h" #include "Logging.h" -#include <VBox/err.h> +#include <iprt/errcore.h> int netIfNetworkInterfaceHelperServer (SVCHlpClient *aClient, SVCHlpMsg::Code aMsgCode); diff --git a/src/VBox/Main/src-server/win/svcmain.cpp b/src/VBox/Main/src-server/win/svcmain.cpp index 1fd77ebb4fa..e7bc7ca4abb 100644 --- a/src/VBox/Main/src-server/win/svcmain.cpp +++ b/src/VBox/Main/src-server/win/svcmain.cpp @@ -33,7 +33,7 @@ #include "svchlp.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/buildconfig.h> #include <iprt/initterm.h> #include <iprt/string.h> diff --git a/src/VBox/Main/src-server/xpcom/server_module.cpp b/src/VBox/Main/src-server/xpcom/server_module.cpp index da30b3a7304..de7ec8ab7ad 100644 --- a/src/VBox/Main/src-server/xpcom/server_module.cpp +++ b/src/VBox/Main/src-server/xpcom/server_module.cpp @@ -47,7 +47,7 @@ #include "server.h" #include "Logging.h" -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/assert.h> #include <iprt/param.h> diff --git a/src/VBox/Main/testcase/tstGuid.cpp b/src/VBox/Main/testcase/tstGuid.cpp index 08681a16358..de87b324728 100644 --- a/src/VBox/Main/testcase/tstGuid.cpp +++ b/src/VBox/Main/testcase/tstGuid.cpp @@ -21,7 +21,7 @@ *********************************************************************************************************************************/ #include <VBox/com/Guid.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/string.h> #include <iprt/test.h> diff --git a/src/VBox/Main/testcase/tstVBoxMultipleVM.cpp b/src/VBox/Main/testcase/tstVBoxMultipleVM.cpp index 2accf887d22..a35e16ed8c9 100644 --- a/src/VBox/Main/testcase/tstVBoxMultipleVM.cpp +++ b/src/VBox/Main/testcase/tstVBoxMultipleVM.cpp @@ -25,7 +25,7 @@ #include <VBox/com/ErrorInfo.h> #include <VBox/com/errorprint.h> #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <VBox/com/VirtualBox.h> #include <iprt/stream.h> #include <iprt/semaphore.h> diff --git a/src/VBox/Main/webservice/webtest.cpp b/src/VBox/Main/webservice/webtest.cpp index 0cb98d1a3ae..41dc0570182 100644 --- a/src/VBox/Main/webservice/webtest.cpp +++ b/src/VBox/Main/webservice/webtest.cpp @@ -28,7 +28,7 @@ #include <iprt/initterm.h> #include <iprt/message.h> -#include <iprt/err.h> +#include <iprt/errcore.h> static void usage(int exitcode) diff --git a/src/VBox/NetworkServices/Dhcpd/Db.cpp b/src/VBox/NetworkServices/Dhcpd/Db.cpp index 34c1761f6bf..e97a387322e 100644 --- a/src/VBox/NetworkServices/Dhcpd/Db.cpp +++ b/src/VBox/NetworkServices/Dhcpd/Db.cpp @@ -15,7 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/stream.h> #include "Db.h" diff --git a/src/VBox/NetworkServices/Dhcpd/IPv4Pool.cpp b/src/VBox/NetworkServices/Dhcpd/IPv4Pool.cpp index f114e33f084..721079aed8a 100644 --- a/src/VBox/NetworkServices/Dhcpd/IPv4Pool.cpp +++ b/src/VBox/NetworkServices/Dhcpd/IPv4Pool.cpp @@ -15,7 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/stream.h> #include "IPv4Pool.h" diff --git a/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp b/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp index 62808463964..955c8f3551b 100644 --- a/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp +++ b/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp @@ -28,7 +28,7 @@ #include <iprt/param.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/message.h> diff --git a/src/VBox/NetworkServices/NAT/RTWinPoll.cpp b/src/VBox/NetworkServices/NAT/RTWinPoll.cpp index cccc6c45636..eb79c48163f 100644 --- a/src/VBox/NetworkServices/NAT/RTWinPoll.cpp +++ b/src/VBox/NetworkServices/NAT/RTWinPoll.cpp @@ -19,10 +19,10 @@ #include <iprt/asm.h> #include <iprt/assert.h> #include <iprt/cdefs.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/win/winsock2.h> diff --git a/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp b/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp index 4e7695866c2..7c11a638e53 100644 --- a/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp +++ b/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp @@ -18,9 +18,9 @@ #include <iprt/asm.h> #include <iprt/assert.h> #include <iprt/cdefs.h> -#include <iprt/err.h> +#include <iprt/errcore.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <iprt/win/winsock2.h> #include <iprt/win/windows.h> diff --git a/src/VBox/NetworkServices/NAT/proxy_pollmgr.c b/src/VBox/NetworkServices/NAT/proxy_pollmgr.c index 906343b52fe..5dea3cf2197 100644 --- a/src/VBox/NetworkServices/NAT/proxy_pollmgr.c +++ b/src/VBox/NetworkServices/NAT/proxy_pollmgr.c @@ -35,14 +35,14 @@ #include <time.h> #include <unistd.h> #else -#include <iprt/err.h> +#include <iprt/errcore.h> #include <stdlib.h> #include <string.h> #include "winpoll.h" #endif #include <iprt/req.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #define POLLMGR_GARBAGE (-1) diff --git a/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp b/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp index 05429bcd472..9fa3de41739 100644 --- a/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp +++ b/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp @@ -34,7 +34,7 @@ #include <iprt/alloca.h> #include <iprt/buildconfig.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/net.h> /* must come before getopt */ #include <iprt/getopt.h> #include <iprt/initterm.h> diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp index e228b2c724a..aeefd32c434 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp @@ -25,7 +25,7 @@ #include <VBox/intnetinline.h> #include <VBox/sup.h> #include <VBox/vmm/vmm.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/string.h> diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp index 00bd25130d5..74a0b34e8ff 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp @@ -29,7 +29,7 @@ #include <iprt/cdefs.h> #include <iprt/cidr.h> #include <iprt/ctype.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/getopt.h> #include <iprt/net.h> #include <iprt/param.h> diff --git a/src/VBox/RDP/client-1.8.3/vrdp/rdpusb.c b/src/VBox/RDP/client-1.8.3/vrdp/rdpusb.c index 695a116ff30..cb559273757 100644 --- a/src/VBox/RDP/client-1.8.3/vrdp/rdpusb.c +++ b/src/VBox/RDP/client-1.8.3/vrdp/rdpusb.c @@ -31,7 +31,7 @@ #include <iprt/cdefs.h> #include <iprt/types.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/log.h> #include <unistd.h> diff --git a/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp b/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp index 73133dad8a6..3ba06a8cebb 100644 --- a/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp +++ b/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp @@ -31,7 +31,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/log.h> -#include <VBox/err.h> +#include <iprt/errcore.h> diff --git a/src/VBox/Storage/testcase/VDIoBackendMem.cpp b/src/VBox/Storage/testcase/VDIoBackendMem.cpp index f0a9d701af5..1edc3db214e 100644 --- a/src/VBox/Storage/testcase/VDIoBackendMem.cpp +++ b/src/VBox/Storage/testcase/VDIoBackendMem.cpp @@ -16,7 +16,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ #define LOGGROUP LOGGROUP_DEFAULT /** @todo Log group */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/log.h> #include <iprt/assert.h> #include <iprt/asm.h> diff --git a/src/VBox/Storage/testcase/VDIoRnd.cpp b/src/VBox/Storage/testcase/VDIoRnd.cpp index b2c84c71743..439091e2463 100644 --- a/src/VBox/Storage/testcase/VDIoRnd.cpp +++ b/src/VBox/Storage/testcase/VDIoRnd.cpp @@ -17,7 +17,7 @@ #define LOGGROUP LOGGROUP_DEFAULT #include <iprt/log.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/rand.h> #include <iprt/assert.h> diff --git a/src/VBox/Storage/testcase/VDMemDisk.cpp b/src/VBox/Storage/testcase/VDMemDisk.cpp index 33248090635..9d62702f9ae 100644 --- a/src/VBox/Storage/testcase/VDMemDisk.cpp +++ b/src/VBox/Storage/testcase/VDMemDisk.cpp @@ -16,7 +16,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ #define LOGGROUP LOGGROUP_DEFAULT /** @todo Log group */ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/log.h> #include <iprt/assert.h> #include <iprt/avl.h> diff --git a/src/VBox/Storage/testcase/VDScript.cpp b/src/VBox/Storage/testcase/VDScript.cpp index 238e84188e5..0ceac67281b 100644 --- a/src/VBox/Storage/testcase/VDScript.cpp +++ b/src/VBox/Storage/testcase/VDScript.cpp @@ -44,7 +44,7 @@ #define LOGGROUP LOGGROUP_DEFAULT #include <iprt/ctype.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/list.h> #include <iprt/mem.h> #include <iprt/stream.h> diff --git a/src/VBox/Storage/testcase/VDScriptChecker.cpp b/src/VBox/Storage/testcase/VDScriptChecker.cpp index 46b4ddd18dc..09209fb22a1 100644 --- a/src/VBox/Storage/testcase/VDScriptChecker.cpp +++ b/src/VBox/Storage/testcase/VDScriptChecker.cpp @@ -17,7 +17,7 @@ #define LOGGROUP LOGGROUP_DEFAULT #include <iprt/assert.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/list.h> #include <iprt/mem.h> diff --git a/src/VBox/Storage/testcase/tstVD.cpp b/src/VBox/Storage/testcase/tstVD.cpp index 896f0a7033b..314aefcd4ad 100644 --- a/src/VBox/Storage/testcase/tstVD.cpp +++ b/src/VBox/Storage/testcase/tstVD.cpp @@ -20,7 +20,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/vd.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/asm-amd64-x86.h> #include <iprt/dir.h> diff --git a/src/VBox/Storage/testcase/tstVDFill.cpp b/src/VBox/Storage/testcase/tstVDFill.cpp index d49a3c4ac33..cab9174754b 100644 --- a/src/VBox/Storage/testcase/tstVDFill.cpp +++ b/src/VBox/Storage/testcase/tstVDFill.cpp @@ -16,7 +16,7 @@ */ #include <VBox/vd.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/asm.h> #include <iprt/dir.h> diff --git a/src/VBox/Storage/testcase/tstVDSnap.cpp b/src/VBox/Storage/testcase/tstVDSnap.cpp index 9faa3fda6ef..96730051c0f 100644 --- a/src/VBox/Storage/testcase/tstVDSnap.cpp +++ b/src/VBox/Storage/testcase/tstVDSnap.cpp @@ -16,7 +16,7 @@ */ #include <VBox/vd.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/log.h> #include <iprt/asm.h> #include <iprt/dir.h> diff --git a/src/VBox/Storage/testcase/vdkeystoremgr.cpp b/src/VBox/Storage/testcase/vdkeystoremgr.cpp index 6ba48f8c3df..c08b549e88d 100644 --- a/src/VBox/Storage/testcase/vdkeystoremgr.cpp +++ b/src/VBox/Storage/testcase/vdkeystoremgr.cpp @@ -20,7 +20,7 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/vd.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #include <VBox/version.h> #include <iprt/initterm.h> #include <iprt/base64.h> diff --git a/src/VBox/ValidationKit/utils/audio/ntPlayToneWaveX.cpp b/src/VBox/ValidationKit/utils/audio/ntPlayToneWaveX.cpp index 30acd15f1c7..fccf403498b 100644 --- a/src/VBox/ValidationKit/utils/audio/ntPlayToneWaveX.cpp +++ b/src/VBox/ValidationKit/utils/audio/ntPlayToneWaveX.cpp @@ -34,7 +34,7 @@ #include <iprt/initterm.h> #include <iprt/message.h> #include <iprt/stream.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #define _USE_MATH_DEFINES #include <math.h> diff --git a/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp b/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp index b2f61187c2a..4f02024ae77 100644 --- a/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp +++ b/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp @@ -67,7 +67,7 @@ #include <iprt/rand.h> #include <iprt/param.h> #include <iprt/string.h> -#include <VBox/err.h> +#include <iprt/errcore.h> #if defined(CIDET_DPRINTF_ENABLED) || defined(CIDET_DEBUG_DISAS) # include <VBox/dis.h> # include <iprt/stream.h> diff --git a/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp b/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp index f736ab44a4a..f944a6b961d 100644 --- a/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp +++ b/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp @@ -28,7 +28,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/thread.h> #include <iprt/time.h> #include <iprt/initterm.h> diff --git a/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp b/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp index cbc34fafa07..6d9faed4c23 100644 --- a/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp +++ b/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include <iprt/mp.h> #include <VBox/sup.h> -#include <VBox/err.h> +#include <iprt/errcore.h> diff --git a/src/VBox/ValidationKit/utils/misc/vts_rm.cpp b/src/VBox/ValidationKit/utils/misc/vts_rm.cpp index 257e036e71e..e4ebdf38720 100644 --- a/src/VBox/ValidationKit/utils/misc/vts_rm.cpp +++ b/src/VBox/ValidationKit/utils/misc/vts_rm.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <iprt/path.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/message.h> diff --git a/src/VBox/ValidationKit/utils/misc/vts_tar.cpp b/src/VBox/ValidationKit/utils/misc/vts_tar.cpp index 0058e3b5532..2c01ee73e2f 100644 --- a/src/VBox/ValidationKit/utils/misc/vts_tar.cpp +++ b/src/VBox/ValidationKit/utils/misc/vts_tar.cpp @@ -29,7 +29,7 @@ * Header Files * *********************************************************************************************************************************/ #include <iprt/zip.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/initterm.h> #include <iprt/message.h> diff --git a/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp b/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp index 9ab636d18ac..71f23828b96 100644 --- a/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp +++ b/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp @@ -36,7 +36,7 @@ #include <iprt/stream.h> #include <iprt/string.h> #include <iprt/thread.h> -#include <iprt/err.h> +#include <iprt/errcore.h> int main(int argc, char **argv) diff --git a/src/VBox/ValidationKit/utils/nt/nttimesources.cpp b/src/VBox/ValidationKit/utils/nt/nttimesources.cpp index de74eab15cf..b8fa2c0bfaa 100644 --- a/src/VBox/ValidationKit/utils/nt/nttimesources.cpp +++ b/src/VBox/ValidationKit/utils/nt/nttimesources.cpp @@ -32,7 +32,7 @@ #include <iprt/asm.h> #include <iprt/asm-amd64-x86.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/string.h> #include <iprt/test.h> diff --git a/src/VBox/ValidationKit/utils/serial/SerialTest.cpp b/src/VBox/ValidationKit/utils/serial/SerialTest.cpp index 0776badd626..8b7b91d4ba4 100644 --- a/src/VBox/ValidationKit/utils/serial/SerialTest.cpp +++ b/src/VBox/ValidationKit/utils/serial/SerialTest.cpp @@ -28,7 +28,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/getopt.h> #include <iprt/mem.h> #include <iprt/path.h> diff --git a/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadget.cpp b/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadget.cpp index a4c61c3d28f..8cc9ba31ddd 100644 --- a/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadget.cpp +++ b/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadget.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include <iprt/asm.h> #include <iprt/ctype.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/string.h> diff --git a/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHost.cpp b/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHost.cpp index 2f3b5fedd16..5399d3c7717 100644 --- a/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHost.cpp +++ b/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHost.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ #include <iprt/asm.h> #include <iprt/ctype.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/mem.h> #include <iprt/string.h> diff --git a/src/bldprogs/VBoxTpG.cpp b/src/bldprogs/VBoxTpG.cpp index 9f9f1200139..3783abb602b 100644 --- a/src/bldprogs/VBoxTpG.cpp +++ b/src/bldprogs/VBoxTpG.cpp @@ -25,7 +25,7 @@ #include <iprt/assert.h> #include <iprt/ctype.h> #include <iprt/env.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/file.h> #include <iprt/getopt.h> #include <iprt/initterm.h> diff --git a/src/bldprogs/scm.cpp b/src/bldprogs/scm.cpp index 2f7c2b8eba9..2d68ef4dc9b 100644 --- a/src/bldprogs/scm.cpp +++ b/src/bldprogs/scm.cpp @@ -175,7 +175,7 @@ static SCMSETTINGSBASE const g_Defaults = /* .fFixFlowerBoxMarkers = */ true, /* .cMinBlankLinesBeforeFlowerBoxMakers = */ 2, /* .fFixTodos = */ true, - /* .fFixErrH = */ false, ///@todo true, + /* .fFixErrH = */ false, /// @todo true, /* .fUpdateCopyrightYear = */ false, /* .fExternalCopyright = */ false, /* .fLgplDisclaimer = */ false, diff --git a/src/bldprogs/scmparser.cpp b/src/bldprogs/scmparser.cpp index 002094d766e..78aa782f10b 100644 --- a/src/bldprogs/scmparser.cpp +++ b/src/bldprogs/scmparser.cpp @@ -24,7 +24,7 @@ #include <iprt/dir.h> #include <iprt/env.h> #include <iprt/file.h> -#include <iprt/err.h> +#include <iprt/errcore.h> #include <iprt/getopt.h> #include <iprt/initterm.h> #include <iprt/mem.h> diff --git a/src/recompiler/exec.c b/src/recompiler/exec.c index 5c696c0a1e4..ca632372dc1 100644 --- a/src/recompiler/exec.c +++ b/src/recompiler/exec.c @@ -48,7 +48,7 @@ # include <iprt/string.h> # include <iprt/param.h> # include <VBox/vmm/pgm.h> /* PGM_DYNAMIC_RAM_ALLOC */ -# include <VBox/err.h> +# include <iprt/errcore.h> #endif /* VBOX */ #include "cpu.h" |