Changeset 5845 in vbox

Timestamp:

Nov 26, 2007 7:08:26 PM (17 years ago)

Author:

vboxsync

Message:

r=bird: fixed clashes.

File:

• trunk/include/VBox/err.h (modified) (2 diffs)

trunk/include/VBox/err.h

@@ -839 +839 @@
  * perform any PCI operations. The device forgot to register it self. */
 #define VERR_PDM_NOT_PCI_DEVICE                     (-2834)
-/** The async completion template is still used. */
-#define VERR_PDM_ASYNC_TEMPLATE_BUSY                (-2835)
-/** The async completion task is already suspended. */
-#define VERR_PDM_ASYNC_COMPLETION_ALREADY_SUSPENDED (-2836)
-/** The async completion task is not suspended. */
-#define VERR_PDM_ASYNC_COMPLETION_NOT_SUSPENDED     (-2837)
 
 /** The version of the device registration structure is unknown
@@ -918 +912 @@
 /** Couldn't find the USB Proxy device. Using OSE? */
 #define VERR_PDM_NO_USBPROXY                        (-2862)
-
+/** The async completion template is still used. */
+#define VERR_PDM_ASYNC_TEMPLATE_BUSY                (-2863)
+/** The async completion task is already suspended. */
+#define VERR_PDM_ASYNC_COMPLETION_ALREADY_SUSPENDED (-2864)
+/** The async completion task is not suspended. */
+#define VERR_PDM_ASYNC_COMPLETION_NOT_SUSPENDED     (-2865)
 /** @} */