[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] build: silence cppi warning, clarify vbox headers



These files are borrowed from upstream release versions, and should
not need further edits in the context of libvirt (instead, a new
upstream vbox release would entail adding a new header file).  We do
not re-generate these files as part of libvirt, nor do we want to lose
our minor edits (such as cppi cleanups).

* src/vbox/vbox_CAPI_v2_2.h: Clarify file origins.
* src/vbox/vbox_CAPI_v3_0.h: Likewise.
* src/vbox/vbox_CAPI_v3_1.h: Likewise.
* src/vbox/vbox_CAPI_v3_2.h: Likewise.  Reindent with cppi.
---

I debated about pushing this as trivial, since it fixes a
'make syntax-check' failure, but decided the inserted comment
may be worth an ack.

 src/vbox/vbox_CAPI_v2_2.h |    5 +-
 src/vbox/vbox_CAPI_v3_0.h |    5 +-
 src/vbox/vbox_CAPI_v3_1.h |    5 +-
 src/vbox/vbox_CAPI_v3_2.h | 1055 +++++++++++++++++++++++----------------------
 4 files changed, 541 insertions(+), 529 deletions(-)

diff --git a/src/vbox/vbox_CAPI_v2_2.h b/src/vbox/vbox_CAPI_v2_2.h
index 674b4e3..d82fe66 100644
--- a/src/vbox/vbox_CAPI_v2_2.h
+++ b/src/vbox/vbox_CAPI_v2_2.h
@@ -1,4 +1,7 @@
-
+/*
+ * Libvirt notice: this file is drived from a particular VBOX snapshot,
+ * with libvirt edits; do not regenerate in the context of libvirt.
+ */
 /*
  *  DO NOT EDIT! This is a generated file.
  *
diff --git a/src/vbox/vbox_CAPI_v3_0.h b/src/vbox/vbox_CAPI_v3_0.h
index 7032fe6..ee4654c 100644
--- a/src/vbox/vbox_CAPI_v3_0.h
+++ b/src/vbox/vbox_CAPI_v3_0.h
@@ -1,4 +1,7 @@
-
+/*
+ * Libvirt notice: this file is drived from a particular VBOX snapshot,
+ * with libvirt edits; do not regenerate in the context of libvirt.
+ */
 /*
  *  DO NOT EDIT! This is a generated file.
  *
diff --git a/src/vbox/vbox_CAPI_v3_1.h b/src/vbox/vbox_CAPI_v3_1.h
index f957f4b..a0cdc7d 100644
--- a/src/vbox/vbox_CAPI_v3_1.h
+++ b/src/vbox/vbox_CAPI_v3_1.h
@@ -1,4 +1,7 @@
-
+/*
+ * Libvirt notice: this file is drived from a particular VBOX snapshot,
+ * with libvirt edits; do not regenerate in the context of libvirt.
+ */
 /*
  *  DO NOT EDIT! This is a generated file.
  *
diff --git a/src/vbox/vbox_CAPI_v3_2.h b/src/vbox/vbox_CAPI_v3_2.h
index b78ff39..c43f350 100644
--- a/src/vbox/vbox_CAPI_v3_2.h
+++ b/src/vbox/vbox_CAPI_v3_2.h
@@ -1,4 +1,7 @@
-
+/*
+ * Libvirt notice: this file is drived from a particular VBOX snapshot,
+ * with libvirt edits; do not regenerate in the context of libvirt.
+ */
 /*
  *  DO NOT EDIT! This is a generated file.
  *
@@ -39,193 +42,193 @@
  */

 #ifndef ___VirtualBox_CXPCOM_h
-#define ___VirtualBox_CXPCOM_h
+# define ___VirtualBox_CXPCOM_h

-#ifdef __cplusplus
-# include "VirtualBox_XPCOM.h"
-#else /* !__cplusplus */
+# ifdef __cplusplus
+#  include "VirtualBox_XPCOM.h"
+# else /* !__cplusplus */

-#include <stddef.h>
-#include "wchar.h"
+#  include <stddef.h>
+#  include "wchar.h"

-#if defined(WIN32)
+#  if defined(WIN32)

-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) __declspec(dllimport) __type
-#define PR_IMPORT_DATA(__type) __declspec(dllimport) __type
+#   define PR_EXPORT(__type) extern __declspec(dllexport) __type
+#   define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
+#   define PR_IMPORT(__type) __declspec(dllimport) __type
+#   define PR_IMPORT_DATA(__type) __declspec(dllimport) __type

-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
+#   define PR_EXTERN(__type) extern __declspec(dllexport) __type
+#   define PR_IMPLEMENT(__type) __declspec(dllexport) __type
+#   define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
+#   define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type

-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
+#   define PR_CALLBACK
+#   define PR_CALLBACK_DECL
+#   define PR_STATIC_CALLBACK(__x) static __x

-#elif defined(XP_BEOS)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(dllexport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(WIN16)
-
-#define PR_CALLBACK_DECL        __cdecl
-
-#if defined(_WINDLL)
-#define PR_EXPORT(__type) extern __type _cdecl _export _loadds
-#define PR_IMPORT(__type) extern __type _cdecl _export _loadds
-#define PR_EXPORT_DATA(__type) extern __type _export
-#define PR_IMPORT_DATA(__type) extern __type _export
-
-#define PR_EXTERN(__type) extern __type _cdecl _export _loadds
-#define PR_IMPLEMENT(__type) __type _cdecl _export _loadds
-#define PR_EXTERN_DATA(__type) extern __type _export
-#define PR_IMPLEMENT_DATA(__type) __type _export
-
-#define PR_CALLBACK             __cdecl __loadds
-#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
-
-#else /* this must be .EXE */
-#define PR_EXPORT(__type) extern __type _cdecl _export
-#define PR_IMPORT(__type) extern __type _cdecl _export
-#define PR_EXPORT_DATA(__type) extern __type _export
-#define PR_IMPORT_DATA(__type) extern __type _export
-
-#define PR_EXTERN(__type) extern __type _cdecl _export
-#define PR_IMPLEMENT(__type) __type _cdecl _export
-#define PR_EXTERN_DATA(__type) extern __type _export
-#define PR_IMPLEMENT_DATA(__type) __type _export
-
-#define PR_CALLBACK             __cdecl __loadds
-#define PR_STATIC_CALLBACK(__x) __x PR_CALLBACK
-#endif /* _WINDLL */
-
-#elif defined(XP_MAC)
-
-#define PR_EXPORT(__type) extern __declspec(export) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(export) __type
-#define PR_IMPORT(__type) extern __declspec(export) __type
-#define PR_IMPORT_DATA(__type) extern __declspec(export) __type
-
-#define PR_EXTERN(__type) extern __declspec(export) __type
-#define PR_IMPLEMENT(__type) __declspec(export) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(export) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(export) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_OS2) && defined(__declspec)
-
-#define PR_EXPORT(__type) extern __declspec(dllexport) __type
-#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPORT(__type) __declspec(dllimport) __type
-#define PR_IMPORT_DATA(__type) __declspec(dllimport) __type
-
-#define PR_EXTERN(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT(__type) __declspec(dllexport) __type
-#define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
-
-#define PR_CALLBACK
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x
-
-#elif defined(XP_OS2_VACPP)
-
-#define PR_EXPORT(__type) extern __type
-#define PR_EXPORT_DATA(__type) extern __type
-#define PR_IMPORT(__type) extern __type
-#define PR_IMPORT_DATA(__type) extern __type
-
-#define PR_EXTERN(__type) extern __type
-#define PR_IMPLEMENT(__type) __type
-#define PR_EXTERN_DATA(__type) extern __type
-#define PR_IMPLEMENT_DATA(__type) __type
-#define PR_CALLBACK _Optlink
-#define PR_CALLBACK_DECL
-#define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
-
-#else /* Unix */
-
-# ifdef VBOX_HAVE_VISIBILITY_HIDDEN
-#  define PR_EXPORT(__type) __attribute__((visibility("default"))) extern __type
-#  define PR_EXPORT_DATA(__type) __attribute__((visibility("default"))) extern __type
-#  define PR_IMPORT(__type) extern __type
-#  define PR_IMPORT_DATA(__type) extern __type
-#  define PR_EXTERN(__type) __attribute__((visibility("default"))) extern __type
-#  define PR_IMPLEMENT(__type) __attribute__((visibility("default"))) __type
-#  define PR_EXTERN_DATA(__type) __attribute__((visibility("default"))) extern __type
-#  define PR_IMPLEMENT_DATA(__type) __attribute__((visibility("default"))) __type
-#  define PR_CALLBACK
-#  define PR_CALLBACK_DECL
-#  define PR_STATIC_CALLBACK(__x) static __x
-# else
-#  define PR_EXPORT(__type) extern __type
-#  define PR_EXPORT_DATA(__type) extern __type
-#  define PR_IMPORT(__type) extern __type
-#  define PR_IMPORT_DATA(__type) extern __type
-#  define PR_EXTERN(__type) extern __type
-#  define PR_IMPLEMENT(__type) __type
-#  define PR_EXTERN_DATA(__type) extern __type
-#  define PR_IMPLEMENT_DATA(__type) __type
-#  define PR_CALLBACK
-#  define PR_CALLBACK_DECL
-#  define PR_STATIC_CALLBACK(__x) static __x
-# endif
-#endif
+#  elif defined(XP_BEOS)

-#if defined(_NSPR_BUILD_)
-#define NSPR_API(__type) PR_EXPORT(__type)
-#define NSPR_DATA_API(__type) PR_EXPORT_DATA(__type)
-#else
-#define NSPR_API(__type) PR_IMPORT(__type)
-#define NSPR_DATA_API(__type) PR_IMPORT_DATA(__type)
-#endif
+#   define PR_EXPORT(__type) extern __declspec(dllexport) __type
+#   define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
+#   define PR_IMPORT(__type) extern __declspec(dllexport) __type
+#   define PR_IMPORT_DATA(__type) extern __declspec(dllexport) __type
+
+#   define PR_EXTERN(__type) extern __declspec(dllexport) __type
+#   define PR_IMPLEMENT(__type) __declspec(dllexport) __type
+#   define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
+#   define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
+
+#   define PR_CALLBACK
+#   define PR_CALLBACK_DECL
+#   define PR_STATIC_CALLBACK(__x) static __x
+
+#  elif defined(WIN16)
+
+#   define PR_CALLBACK_DECL        __cdecl
+
+#   if defined(_WINDLL)
+#    define PR_EXPORT(__type) extern __type _cdecl _export _loadds
+#    define PR_IMPORT(__type) extern __type _cdecl _export _loadds
+#    define PR_EXPORT_DATA(__type) extern __type _export
+#    define PR_IMPORT_DATA(__type) extern __type _export
+
+#    define PR_EXTERN(__type) extern __type _cdecl _export _loadds
+#    define PR_IMPLEMENT(__type) __type _cdecl _export _loadds
+#    define PR_EXTERN_DATA(__type) extern __type _export
+#    define PR_IMPLEMENT_DATA(__type) __type _export
+
+#    define PR_CALLBACK             __cdecl __loadds
+#    define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
+
+#   else /* this must be .EXE */
+#    define PR_EXPORT(__type) extern __type _cdecl _export
+#    define PR_IMPORT(__type) extern __type _cdecl _export
+#    define PR_EXPORT_DATA(__type) extern __type _export
+#    define PR_IMPORT_DATA(__type) extern __type _export
+
+#    define PR_EXTERN(__type) extern __type _cdecl _export
+#    define PR_IMPLEMENT(__type) __type _cdecl _export
+#    define PR_EXTERN_DATA(__type) extern __type _export
+#    define PR_IMPLEMENT_DATA(__type) __type _export
+
+#    define PR_CALLBACK             __cdecl __loadds
+#    define PR_STATIC_CALLBACK(__x) __x PR_CALLBACK
+#   endif /* _WINDLL */
+
+#  elif defined(XP_MAC)
+
+#   define PR_EXPORT(__type) extern __declspec(export) __type
+#   define PR_EXPORT_DATA(__type) extern __declspec(export) __type
+#   define PR_IMPORT(__type) extern __declspec(export) __type
+#   define PR_IMPORT_DATA(__type) extern __declspec(export) __type
+
+#   define PR_EXTERN(__type) extern __declspec(export) __type
+#   define PR_IMPLEMENT(__type) __declspec(export) __type
+#   define PR_EXTERN_DATA(__type) extern __declspec(export) __type
+#   define PR_IMPLEMENT_DATA(__type) __declspec(export) __type
+
+#   define PR_CALLBACK
+#   define PR_CALLBACK_DECL
+#   define PR_STATIC_CALLBACK(__x) static __x
+
+#  elif defined(XP_OS2) && defined(__declspec)
+
+#   define PR_EXPORT(__type) extern __declspec(dllexport) __type
+#   define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
+#   define PR_IMPORT(__type) __declspec(dllimport) __type
+#   define PR_IMPORT_DATA(__type) __declspec(dllimport) __type
+
+#   define PR_EXTERN(__type) extern __declspec(dllexport) __type
+#   define PR_IMPLEMENT(__type) __declspec(dllexport) __type
+#   define PR_EXTERN_DATA(__type) extern __declspec(dllexport) __type
+#   define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type
+
+#   define PR_CALLBACK
+#   define PR_CALLBACK_DECL
+#   define PR_STATIC_CALLBACK(__x) static __x
+
+#  elif defined(XP_OS2_VACPP)
+
+#   define PR_EXPORT(__type) extern __type
+#   define PR_EXPORT_DATA(__type) extern __type
+#   define PR_IMPORT(__type) extern __type
+#   define PR_IMPORT_DATA(__type) extern __type
+
+#   define PR_EXTERN(__type) extern __type
+#   define PR_IMPLEMENT(__type) __type
+#   define PR_EXTERN_DATA(__type) extern __type
+#   define PR_IMPLEMENT_DATA(__type) __type
+#   define PR_CALLBACK _Optlink
+#   define PR_CALLBACK_DECL
+#   define PR_STATIC_CALLBACK(__x) static __x PR_CALLBACK
+
+#  else /* Unix */
+
+#   ifdef VBOX_HAVE_VISIBILITY_HIDDEN
+#    define PR_EXPORT(__type) __attribute__((visibility("default"))) extern __type
+#    define PR_EXPORT_DATA(__type) __attribute__((visibility("default"))) extern __type
+#    define PR_IMPORT(__type) extern __type
+#    define PR_IMPORT_DATA(__type) extern __type
+#    define PR_EXTERN(__type) __attribute__((visibility("default"))) extern __type
+#    define PR_IMPLEMENT(__type) __attribute__((visibility("default"))) __type
+#    define PR_EXTERN_DATA(__type) __attribute__((visibility("default"))) extern __type
+#    define PR_IMPLEMENT_DATA(__type) __attribute__((visibility("default"))) __type
+#    define PR_CALLBACK
+#    define PR_CALLBACK_DECL
+#    define PR_STATIC_CALLBACK(__x) static __x
+#   else
+#    define PR_EXPORT(__type) extern __type
+#    define PR_EXPORT_DATA(__type) extern __type
+#    define PR_IMPORT(__type) extern __type
+#    define PR_IMPORT_DATA(__type) extern __type
+#    define PR_EXTERN(__type) extern __type
+#    define PR_IMPLEMENT(__type) __type
+#    define PR_EXTERN_DATA(__type) extern __type
+#    define PR_IMPLEMENT_DATA(__type) __type
+#    define PR_CALLBACK
+#    define PR_CALLBACK_DECL
+#    define PR_STATIC_CALLBACK(__x) static __x
+#   endif
+#  endif
+
+#  if defined(_NSPR_BUILD_)
+#   define NSPR_API(__type) PR_EXPORT(__type)
+#   define NSPR_DATA_API(__type) PR_EXPORT_DATA(__type)
+#  else
+#   define NSPR_API(__type) PR_IMPORT(__type)
+#   define NSPR_DATA_API(__type) PR_IMPORT_DATA(__type)
+#  endif

 typedef unsigned char PRUint8;
-#if (defined(HPUX) && defined(__cplusplus) \
+#  if (defined(HPUX) && defined(__cplusplus) \
         && !defined(__GNUC__) && __cplusplus < 199707L) \
     || (defined(SCO) && defined(__cplusplus) \
         && !defined(__GNUC__) && __cplusplus == 1L)
 typedef char PRInt8;
-#else
+#  else
 typedef signed char PRInt8;
-#endif
+#  endif

-#define PR_INT8_MAX 127
-#define PR_INT8_MIN (-128)
-#define PR_UINT8_MAX 255U
+#  define PR_INT8_MAX 127
+#  define PR_INT8_MIN (-128)
+#  define PR_UINT8_MAX 255U

 typedef unsigned short PRUint16;
 typedef short PRInt16;

-#define PR_INT16_MAX 32767
-#define PR_INT16_MIN (-32768)
-#define PR_UINT16_MAX 65535U
+#  define PR_INT16_MAX 32767
+#  define PR_INT16_MIN (-32768)
+#  define PR_UINT16_MAX 65535U

 typedef unsigned int PRUint32;
 typedef int PRInt32;
-#define PR_INT32(x)  x
-#define PR_UINT32(x) x ## U
+#  define PR_INT32(x)  x
+#  define PR_UINT32(x) x ## U

-#define PR_INT32_MAX PR_INT32(2147483647)
-#define PR_INT32_MIN (-PR_INT32_MAX - 1)
-#define PR_UINT32_MAX PR_UINT32(4294967295)
+#  define PR_INT32_MAX PR_INT32(2147483647)
+#  define PR_INT32_MIN (-PR_INT32_MAX - 1)
+#  define PR_UINT32_MAX PR_UINT32(4294967295)

 typedef long PRInt64;
 typedef unsigned long PRUint64;
@@ -241,8 +244,8 @@ typedef unsigned long PRUptrdiff;

 typedef PRIntn PRBool;

-#define PR_TRUE 1
-#define PR_FALSE 0
+#  define PR_TRUE 1
+#  define PR_FALSE 0

 typedef PRUint8 PRPackedBool;

@@ -252,56 +255,56 @@ typedef PRUint8 PRPackedBool;
 */
 typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;

-#ifndef __PRUNICHAR__
-#define __PRUNICHAR__
-#if defined(WIN32) || defined(XP_MAC)
+#  ifndef __PRUNICHAR__
+#   define __PRUNICHAR__
+#   if defined(WIN32) || defined(XP_MAC)
 typedef wchar_t PRUnichar;
-#else
+#   else
 typedef PRUint16 PRUnichar;
-#endif
-#endif
+#   endif
+#  endif

 typedef long PRWord;
 typedef unsigned long PRUword;

-#define nsnull 0
+#  define nsnull 0
 typedef PRUint32 nsresult;

-#if defined(__GNUC__) && (__GNUC__ > 2)
-#define NS_LIKELY(x)    (__builtin_expect((x), 1))
-#define NS_UNLIKELY(x)  (__builtin_expect((x), 0))
-#else
-#define NS_LIKELY(x)    (x)
-#define NS_UNLIKELY(x)  (x)
-#endif
-
-#define NS_FAILED(_nsresult) (NS_UNLIKELY((_nsresult) & 0x80000000))
-#define NS_SUCCEEDED(_nsresult) (NS_LIKELY(!((_nsresult) & 0x80000000)))
-
-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-# define PR_IntervalNow VBoxNsprPR_IntervalNow
-# define PR_TicksPerSecond VBoxNsprPR_TicksPerSecond
-# define PR_SecondsToInterval VBoxNsprPR_SecondsToInterval
-# define PR_MillisecondsToInterval VBoxNsprPR_MillisecondsToInterval
-# define PR_MicrosecondsToInterval VBoxNsprPR_MicrosecondsToInterval
-# define PR_IntervalToSeconds VBoxNsprPR_IntervalToSeconds
-# define PR_IntervalToMilliseconds VBoxNsprPR_IntervalToMilliseconds
-# define PR_IntervalToMicroseconds VBoxNsprPR_IntervalToMicroseconds
-# define PR_EnterMonitor VBoxNsprPR_EnterMonitor
-# define PR_ExitMonitor VBoxNsprPR_ExitMonitor
-# define PR_Notify VBoxNsprPR_Notify
-# define PR_NotifyAll VBoxNsprPR_NotifyAll
-# define PR_Wait VBoxNsprPR_Wait
-# define PR_NewMonitor VBoxNsprPR_NewMonitor
-# define PR_DestroyMonitor VBoxNsprPR_DestroyMonitor
-#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+#  if defined(__GNUC__) && (__GNUC__ > 2)
+#   define NS_LIKELY(x)    (__builtin_expect((x), 1))
+#   define NS_UNLIKELY(x)  (__builtin_expect((x), 0))
+#  else
+#   define NS_LIKELY(x)    (x)
+#   define NS_UNLIKELY(x)  (x)
+#  endif
+
+#  define NS_FAILED(_nsresult) (NS_UNLIKELY((_nsresult) & 0x80000000))
+#  define NS_SUCCEEDED(_nsresult) (NS_LIKELY(!((_nsresult) & 0x80000000)))
+
+#  ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#   define PR_IntervalNow VBoxNsprPR_IntervalNow
+#   define PR_TicksPerSecond VBoxNsprPR_TicksPerSecond
+#   define PR_SecondsToInterval VBoxNsprPR_SecondsToInterval
+#   define PR_MillisecondsToInterval VBoxNsprPR_MillisecondsToInterval
+#   define PR_MicrosecondsToInterval VBoxNsprPR_MicrosecondsToInterval
+#   define PR_IntervalToSeconds VBoxNsprPR_IntervalToSeconds
+#   define PR_IntervalToMilliseconds VBoxNsprPR_IntervalToMilliseconds
+#   define PR_IntervalToMicroseconds VBoxNsprPR_IntervalToMicroseconds
+#   define PR_EnterMonitor VBoxNsprPR_EnterMonitor
+#   define PR_ExitMonitor VBoxNsprPR_ExitMonitor
+#   define PR_Notify VBoxNsprPR_Notify
+#   define PR_NotifyAll VBoxNsprPR_NotifyAll
+#   define PR_Wait VBoxNsprPR_Wait
+#   define PR_NewMonitor VBoxNsprPR_NewMonitor
+#   define PR_DestroyMonitor VBoxNsprPR_DestroyMonitor
+#  endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */

 typedef PRUint32 PRIntervalTime;

-#define PR_INTERVAL_MIN 1000UL
-#define PR_INTERVAL_MAX 100000UL
-#define PR_INTERVAL_NO_WAIT 0UL
-#define PR_INTERVAL_NO_TIMEOUT 0xffffffffUL
+#  define PR_INTERVAL_MIN 1000UL
+#  define PR_INTERVAL_MAX 100000UL
+#  define PR_INTERVAL_NO_WAIT 0UL
+#  define PR_INTERVAL_NO_TIMEOUT 0xffffffffUL

 NSPR_API(PRIntervalTime) PR_IntervalNow(void);
 NSPR_API(PRUint32) PR_TicksPerSecond(void);
@@ -322,24 +325,24 @@ NSPR_API(PRStatus) PR_Wait(PRMonitor *mon, PRIntervalTime ticks);
 NSPR_API(PRStatus) PR_Notify(PRMonitor *mon);
 NSPR_API(PRStatus) PR_NotifyAll(PRMonitor *mon);

-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-# define PR_CreateThread VBoxNsprPR_CreateThread
-# define PR_JoinThread VBoxNsprPR_JoinThread
-# define PR_Sleep VBoxNsprPR_Sleep
-# define PR_GetCurrentThread VBoxNsprPR_GetCurrentThread
-# define PR_GetThreadState VBoxNsprPR_GetThreadState
-# define PR_SetThreadPrivate VBoxNsprPR_SetThreadPrivate
-# define PR_GetThreadPrivate VBoxNsprPR_GetThreadPrivate
-# define PR_NewThreadPrivateIndex VBoxNsprPR_NewThreadPrivateIndex
-# define PR_GetThreadPriority VBoxNsprPR_GetThreadPriority
-# define PR_SetThreadPriority VBoxNsprPR_SetThreadPriority
-# define PR_Interrupt VBoxNsprPR_Interrupt
-# define PR_ClearInterrupt VBoxNsprPR_ClearInterrupt
-# define PR_BlockInterrupt VBoxNsprPR_BlockInterrupt
-# define PR_UnblockInterrupt VBoxNsprPR_UnblockInterrupt
-# define PR_GetThreadScope VBoxNsprPR_GetThreadScope
-# define PR_GetThreadType VBoxNsprPR_GetThreadType
-#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+#  ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#   define PR_CreateThread VBoxNsprPR_CreateThread
+#   define PR_JoinThread VBoxNsprPR_JoinThread
+#   define PR_Sleep VBoxNsprPR_Sleep
+#   define PR_GetCurrentThread VBoxNsprPR_GetCurrentThread
+#   define PR_GetThreadState VBoxNsprPR_GetThreadState
+#   define PR_SetThreadPrivate VBoxNsprPR_SetThreadPrivate
+#   define PR_GetThreadPrivate VBoxNsprPR_GetThreadPrivate
+#   define PR_NewThreadPrivateIndex VBoxNsprPR_NewThreadPrivateIndex
+#   define PR_GetThreadPriority VBoxNsprPR_GetThreadPriority
+#   define PR_SetThreadPriority VBoxNsprPR_SetThreadPriority
+#   define PR_Interrupt VBoxNsprPR_Interrupt
+#   define PR_ClearInterrupt VBoxNsprPR_ClearInterrupt
+#   define PR_BlockInterrupt VBoxNsprPR_BlockInterrupt
+#   define PR_UnblockInterrupt VBoxNsprPR_UnblockInterrupt
+#   define PR_GetThreadScope VBoxNsprPR_GetThreadScope
+#   define PR_GetThreadType VBoxNsprPR_GetThreadType
+#  endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */

 typedef struct PRThread PRThread;
 typedef struct PRThreadStack PRThreadStack;
@@ -379,9 +382,9 @@ NSPR_API(PRThread*) PR_CreateThread(PRThreadType type,
                      PRUint32 stackSize);
 NSPR_API(PRStatus) PR_JoinThread(PRThread *thread);
 NSPR_API(PRThread*) PR_GetCurrentThread(void);
-#ifndef NO_NSPR_10_SUPPORT
-#define PR_CurrentThread() PR_GetCurrentThread() /* for nspr1.0 compat. */
-#endif /* NO_NSPR_10_SUPPORT */
+#  ifndef NO_NSPR_10_SUPPORT
+#   define PR_CurrentThread() PR_GetCurrentThread() /* for nspr1.0 compat. */
+#  endif /* NO_NSPR_10_SUPPORT */
 NSPR_API(PRThreadPriority) PR_GetThreadPriority(const PRThread *thread);
 NSPR_API(void) PR_SetThreadPriority(PRThread *thread, PRThreadPriority priority);

@@ -400,12 +403,12 @@ NSPR_API(PRThreadScope) PR_GetThreadScope(const PRThread *thread);
 NSPR_API(PRThreadType) PR_GetThreadType(const PRThread *thread);
 NSPR_API(PRThreadState) PR_GetThreadState(const PRThread *thread);

-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-# define PR_DestroyLock VBoxNsprPR_DestroyLock
-# define PR_Lock VBoxNsprPR_Lock
-# define PR_NewLock VBoxNsprPR_NewLock
-# define PR_Unlock VBoxNsprPR_Unlock
-#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+#  ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#   define PR_DestroyLock VBoxNsprPR_DestroyLock
+#   define PR_Lock VBoxNsprPR_Lock
+#   define PR_NewLock VBoxNsprPR_NewLock
+#   define PR_Unlock VBoxNsprPR_Unlock
+#  endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */

 typedef struct PRLock PRLock;

@@ -414,13 +417,13 @@ NSPR_API(void) PR_DestroyLock(PRLock *lock);
 NSPR_API(void) PR_Lock(PRLock *lock);
 NSPR_API(PRStatus) PR_Unlock(PRLock *lock);

-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-# define PR_NewCondVar VBoxNsprPR_NewCondVar
-# define PR_DestroyCondVar VBoxNsprPR_DestroyCondVar
-# define PR_WaitCondVar VBoxNsprPR_WaitCondVar
-# define PR_NotifyCondVar VBoxNsprPR_NotifyCondVar
-# define PR_NotifyAllCondVar VBoxNsprPR_NotifyAllCondVar
-#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+#  ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#   define PR_NewCondVar VBoxNsprPR_NewCondVar
+#   define PR_DestroyCondVar VBoxNsprPR_DestroyCondVar
+#   define PR_WaitCondVar VBoxNsprPR_WaitCondVar
+#   define PR_NotifyCondVar VBoxNsprPR_NotifyCondVar
+#   define PR_NotifyAllCondVar VBoxNsprPR_NotifyAllCondVar
+#  endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */

 typedef struct PRCondVar PRCondVar;

@@ -437,34 +440,34 @@ struct PRCListStr {
     PRCList *prev;
 };

-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-# define PL_DestroyEvent VBoxNsplPL_DestroyEvent
-# define PL_HandleEvent VBoxNsplPL_HandleEvent
-# define PL_InitEvent VBoxNsplPL_InitEvent
-# define PL_CreateEventQueue VBoxNsplPL_CreateEventQueue
-# define PL_CreateMonitoredEventQueue VBoxNsplPL_CreateMonitoredEventQueue
-# define PL_CreateNativeEventQueue VBoxNsplPL_CreateNativeEventQueue
-# define PL_DequeueEvent VBoxNsplPL_DequeueEvent
-# define PL_DestroyEventQueue VBoxNsplPL_DestroyEventQueue
-# define PL_EventAvailable VBoxNsplPL_EventAvailable
-# define PL_EventLoop VBoxNsplPL_EventLoop
-# define PL_GetEvent VBoxNsplPL_GetEvent
-# define PL_GetEventOwner VBoxNsplPL_GetEventOwner
-# define PL_GetEventQueueMonitor VBoxNsplPL_GetEventQueueMonitor
-# define PL_GetEventQueueSelectFD VBoxNsplPL_GetEventQueueSelectFD
-# define PL_MapEvents VBoxNsplPL_MapEvents
-# define PL_PostEvent VBoxNsplPL_PostEvent
-# define PL_PostSynchronousEvent VBoxNsplPL_PostSynchronousEvent
-# define PL_ProcessEventsBeforeID VBoxNsplPL_ProcessEventsBeforeID
-# define PL_ProcessPendingEvents VBoxNsplPL_ProcessPendingEvents
-# define PL_RegisterEventIDFunc VBoxNsplPL_RegisterEventIDFunc
-# define PL_RevokeEvents VBoxNsplPL_RevokeEvents
-# define PL_UnregisterEventIDFunc VBoxNsplPL_UnregisterEventIDFunc
-# define PL_WaitForEvent VBoxNsplPL_WaitForEvent
-# define PL_IsQueueNative VBoxNsplPL_IsQueueNative
-# define PL_IsQueueOnCurrentThread VBoxNsplPL_IsQueueOnCurrentThread
-# define PL_FavorPerformanceHint VBoxNsplPL_FavorPerformanceHint
-#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+#  ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#   define PL_DestroyEvent VBoxNsplPL_DestroyEvent
+#   define PL_HandleEvent VBoxNsplPL_HandleEvent
+#   define PL_InitEvent VBoxNsplPL_InitEvent
+#   define PL_CreateEventQueue VBoxNsplPL_CreateEventQueue
+#   define PL_CreateMonitoredEventQueue VBoxNsplPL_CreateMonitoredEventQueue
+#   define PL_CreateNativeEventQueue VBoxNsplPL_CreateNativeEventQueue
+#   define PL_DequeueEvent VBoxNsplPL_DequeueEvent
+#   define PL_DestroyEventQueue VBoxNsplPL_DestroyEventQueue
+#   define PL_EventAvailable VBoxNsplPL_EventAvailable
+#   define PL_EventLoop VBoxNsplPL_EventLoop
+#   define PL_GetEvent VBoxNsplPL_GetEvent
+#   define PL_GetEventOwner VBoxNsplPL_GetEventOwner
+#   define PL_GetEventQueueMonitor VBoxNsplPL_GetEventQueueMonitor
+#   define PL_GetEventQueueSelectFD VBoxNsplPL_GetEventQueueSelectFD
+#   define PL_MapEvents VBoxNsplPL_MapEvents
+#   define PL_PostEvent VBoxNsplPL_PostEvent
+#   define PL_PostSynchronousEvent VBoxNsplPL_PostSynchronousEvent
+#   define PL_ProcessEventsBeforeID VBoxNsplPL_ProcessEventsBeforeID
+#   define PL_ProcessPendingEvents VBoxNsplPL_ProcessPendingEvents
+#   define PL_RegisterEventIDFunc VBoxNsplPL_RegisterEventIDFunc
+#   define PL_RevokeEvents VBoxNsplPL_RevokeEvents
+#   define PL_UnregisterEventIDFunc VBoxNsplPL_UnregisterEventIDFunc
+#   define PL_WaitForEvent VBoxNsplPL_WaitForEvent
+#   define PL_IsQueueNative VBoxNsplPL_IsQueueNative
+#   define PL_IsQueueOnCurrentThread VBoxNsplPL_IsQueueOnCurrentThread
+#   define PL_FavorPerformanceHint VBoxNsplPL_FavorPerformanceHint
+#  endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */

 typedef struct PLEvent PLEvent;
 typedef struct PLEventQueue PLEventQueue;
@@ -486,10 +489,10 @@ PL_DestroyEventQueue(PLEventQueue* self);
 PR_EXTERN(PRMonitor*)
 PL_GetEventQueueMonitor(PLEventQueue* self);

-#define PL_ENTER_EVENT_QUEUE_MONITOR(queue) \
+#  define PL_ENTER_EVENT_QUEUE_MONITOR(queue) \
     PR_EnterMonitor(PL_GetEventQueueMonitor(queue))

-#define PL_EXIT_EVENT_QUEUE_MONITOR(queue)  \
+#  define PL_EXIT_EVENT_QUEUE_MONITOR(queue)  \
     PR_ExitMonitor(PL_GetEventQueueMonitor(queue))

 PR_EXTERN(PRStatus) PL_PostEvent(PLEventQueue* self, PLEvent* event);
@@ -529,24 +532,24 @@ struct PLEvent {
     PRLock*             lock;
     PRCondVar*          condVar;
     PRBool              handled;
-#ifdef PL_POST_TIMINGS
+#  ifdef PL_POST_TIMINGS
     PRIntervalTime      postTime;
-#endif
-#ifdef XP_UNIX
+#  endif
+#  ifdef XP_UNIX
     unsigned long       id;
-#endif /* XP_UNIX */
+#  endif /* XP_UNIX */
     /* other fields follow... */
 };

-#if defined(XP_WIN) || defined(XP_OS2)
+#  if defined(XP_WIN) || defined(XP_OS2)

 PR_EXTERN(HWND)
     PL_GetNativeEventReceiverWindow(
         PLEventQueue *eqp
     );
-#endif /* XP_WIN || XP_OS2 */
+#  endif /* XP_WIN || XP_OS2 */

-#ifdef XP_UNIX
+#  ifdef XP_UNIX

 PR_EXTERN(PRInt32)
 PL_ProcessEventsBeforeID(PLEventQueue *aSelf, unsigned long aID);
@@ -558,66 +561,66 @@ PL_RegisterEventIDFunc(PLEventQueue *aSelf, PLGetEventIDFunc aFunc,
                        void *aClosure);
 PR_EXTERN(void) PL_UnregisterEventIDFunc(PLEventQueue *aSelf);

-#endif /* XP_UNIX */
+#  endif /* XP_UNIX */

 /* Standard "it worked" return value */
-#define NS_OK                              0
+#  define NS_OK                              0

-#define NS_ERROR_BASE                      ((nsresult) 0xC1F30000)
+#  define NS_ERROR_BASE                      ((nsresult) 0xC1F30000)

 /* Returned when an instance is not initialized */
-#define NS_ERROR_NOT_INITIALIZED           (NS_ERROR_BASE + 1)
+#  define NS_ERROR_NOT_INITIALIZED           (NS_ERROR_BASE + 1)

 /* Returned when an instance is already initialized */
-#define NS_ERROR_ALREADY_INITIALIZED       (NS_ERROR_BASE + 2)
+#  define NS_ERROR_ALREADY_INITIALIZED       (NS_ERROR_BASE + 2)

 /* Returned by a not implemented function */
-#define NS_ERROR_NOT_IMPLEMENTED           ((nsresult) 0x80004001L)
+#  define NS_ERROR_NOT_IMPLEMENTED           ((nsresult) 0x80004001L)

 /* Returned when a given interface is not supported. */
-#define NS_NOINTERFACE                     ((nsresult) 0x80004002L)
-#define NS_ERROR_NO_INTERFACE              NS_NOINTERFACE
+#  define NS_NOINTERFACE                     ((nsresult) 0x80004002L)
+#  define NS_ERROR_NO_INTERFACE              NS_NOINTERFACE

-#define NS_ERROR_INVALID_POINTER           ((nsresult) 0x80004003L)
-#define NS_ERROR_NULL_POINTER              NS_ERROR_INVALID_POINTER
+#  define NS_ERROR_INVALID_POINTER           ((nsresult) 0x80004003L)
+#  define NS_ERROR_NULL_POINTER              NS_ERROR_INVALID_POINTER

 /* Returned when a function aborts */
-#define NS_ERROR_ABORT                     ((nsresult) 0x80004004L)
+#  define NS_ERROR_ABORT                     ((nsresult) 0x80004004L)

 /* Returned when a function fails */
-#define NS_ERROR_FAILURE                   ((nsresult) 0x80004005L)
+#  define NS_ERROR_FAILURE                   ((nsresult) 0x80004005L)

 /* Returned when an unexpected error occurs */
-#define NS_ERROR_UNEXPECTED                ((nsresult) 0x8000ffffL)
+#  define NS_ERROR_UNEXPECTED                ((nsresult) 0x8000ffffL)

 /* Returned when a memory allocation fails */
-#define NS_ERROR_OUT_OF_MEMORY             ((nsresult) 0x8007000eL)
+#  define NS_ERROR_OUT_OF_MEMORY             ((nsresult) 0x8007000eL)

 /* Returned when an illegal value is passed */
-#define NS_ERROR_ILLEGAL_VALUE             ((nsresult) 0x80070057L)
-#define NS_ERROR_INVALID_ARG               NS_ERROR_ILLEGAL_VALUE
+#  define NS_ERROR_ILLEGAL_VALUE             ((nsresult) 0x80070057L)
+#  define NS_ERROR_INVALID_ARG               NS_ERROR_ILLEGAL_VALUE

 /* Returned when a class doesn't allow aggregation */
-#define NS_ERROR_NO_AGGREGATION            ((nsresult) 0x80040110L)
+#  define NS_ERROR_NO_AGGREGATION            ((nsresult) 0x80040110L)

 /* Returned when an operation can't complete due to an unavailable resource */
-#define NS_ERROR_NOT_AVAILABLE             ((nsresult) 0x80040111L)
+#  define NS_ERROR_NOT_AVAILABLE             ((nsresult) 0x80040111L)

 /* Returned when a class is not registered */
-#define NS_ERROR_FACTORY_NOT_REGISTERED    ((nsresult) 0x80040154L)
+#  define NS_ERROR_FACTORY_NOT_REGISTERED    ((nsresult) 0x80040154L)

 /* Returned when a class cannot be registered, but may be tried again later */
-#define NS_ERROR_FACTORY_REGISTER_AGAIN    ((nsresult) 0x80040155L)
+#  define NS_ERROR_FACTORY_REGISTER_AGAIN    ((nsresult) 0x80040155L)

 /* Returned when a dynamically loaded factory couldn't be found */
-#define NS_ERROR_FACTORY_NOT_LOADED        ((nsresult) 0x800401f8L)
+#  define NS_ERROR_FACTORY_NOT_LOADED        ((nsresult) 0x800401f8L)

 /* Returned when a factory doesn't support signatures */
-#define NS_ERROR_FACTORY_NO_SIGNATURE_SUPPORT \
+#  define NS_ERROR_FACTORY_NO_SIGNATURE_SUPPORT \
                                            (NS_ERROR_BASE + 0x101)

 /* Returned when a factory already is registered */
-#define NS_ERROR_FACTORY_EXISTS            (NS_ERROR_BASE + 0x100)
+#  define NS_ERROR_FACTORY_EXISTS            (NS_ERROR_BASE + 0x100)


 /**
@@ -650,7 +653,7 @@ typedef struct nsIException nsIException;   /* forward declaration */
  * To maintain binary compatibility with COM's IUnknown, we define the IID
  * of nsISupports to be the same as that of COM's IUnknown.
  */
-#define NS_ISUPPORTS_IID                                                      \
+#  define NS_ISUPPORTS_IID                                                      \
   { 0x00000000, 0x0000, 0x0000,                                               \
     {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46} }

@@ -710,9 +713,9 @@ struct nsISupports {
 };

 /* starting interface:    nsIException */
-#define NS_IEXCEPTION_IID_STR "f3a8d3b4-c424-4edc-8bf6-8974c983ba78"
+#  define NS_IEXCEPTION_IID_STR "f3a8d3b4-c424-4edc-8bf6-8974c983ba78"

-#define NS_IEXCEPTION_IID \
+#  define NS_IEXCEPTION_IID \
   {0xf3a8d3b4, 0xc424, 0x4edc, \
     { 0x8b, 0xf6, 0x89, 0x74, 0xc9, 0x83, 0xba, 0x78 }}

@@ -757,9 +760,9 @@ struct nsIException {
 };

 /* starting interface:    nsIStackFrame */
-#define NS_ISTACKFRAME_IID_STR "91d82105-7c62-4f8b-9779-154277c0ee90"
+#  define NS_ISTACKFRAME_IID_STR "91d82105-7c62-4f8b-9779-154277c0ee90"

-#define NS_ISTACKFRAME_IID \
+#  define NS_ISTACKFRAME_IID \
   {0x91d82105, 0x7c62, 0x4f8b, \
     { 0x97, 0x79, 0x15, 0x42, 0x77, 0xc0, 0xee, 0x90 }}

@@ -798,9 +801,9 @@ struct nsIStackFrame {
 };

 /* starting interface:    nsIEventTarget */
-#define NS_IEVENTTARGET_IID_STR "ea99ad5b-cc67-4efb-97c9-2ef620a59f2a"
+#  define NS_IEVENTTARGET_IID_STR "ea99ad5b-cc67-4efb-97c9-2ef620a59f2a"

-#define NS_IEVENTTARGET_IID \
+#  define NS_IEVENTTARGET_IID \
   {0xea99ad5b, 0xcc67, 0x4efb, \
     { 0x97, 0xc9, 0x2e, 0xf6, 0x20, 0xa5, 0x9f, 0x2a }}

@@ -822,9 +825,9 @@ struct nsIEventTarget {
 };

 /* starting interface:    nsIEventQueue */
-#define NS_IEVENTQUEUE_IID_STR "176afb41-00a4-11d3-9f2a-00400553eef0"
+#  define NS_IEVENTQUEUE_IID_STR "176afb41-00a4-11d3-9f2a-00400553eef0"

-#define NS_IEVENTQUEUE_IID \
+#  define NS_IEVENTQUEUE_IID \
   {0x176afb41, 0x00a4, 0x11d3, \
     { 0x9f, 0x2a, 0x00, 0x40, 0x05, 0x53, 0xee, 0xf0 }}

@@ -880,19 +883,19 @@ struct nsIEventQueue {
 };


-#define VBOX_E_OBJECT_NOT_FOUND 0x80BB0001
-#define VBOX_E_INVALID_VM_STATE 0x80BB0002
-#define VBOX_E_VM_ERROR 0x80BB0003
-#define VBOX_E_FILE_ERROR 0x80BB0004
-#define VBOX_E_IPRT_ERROR 0x80BB0005
-#define VBOX_E_PDM_ERROR 0x80BB0006
-#define VBOX_E_INVALID_OBJECT_STATE 0x80BB0007
-#define VBOX_E_HOST_ERROR 0x80BB0008
-#define VBOX_E_NOT_SUPPORTED 0x80BB0009
-#define VBOX_E_XML_ERROR 0x80BB000A
-#define VBOX_E_INVALID_SESSION_STATE 0x80BB000B
-#define VBOX_E_OBJECT_IN_USE 0x80BB000C
-#define VBOX_E_DONT_CALL_AGAIN 0x80BB000D
+#  define VBOX_E_OBJECT_NOT_FOUND 0x80BB0001
+#  define VBOX_E_INVALID_VM_STATE 0x80BB0002
+#  define VBOX_E_VM_ERROR 0x80BB0003
+#  define VBOX_E_FILE_ERROR 0x80BB0004
+#  define VBOX_E_IPRT_ERROR 0x80BB0005
+#  define VBOX_E_PDM_ERROR 0x80BB0006
+#  define VBOX_E_INVALID_OBJECT_STATE 0x80BB0007
+#  define VBOX_E_HOST_ERROR 0x80BB0008
+#  define VBOX_E_NOT_SUPPORTED 0x80BB0009
+#  define VBOX_E_XML_ERROR 0x80BB000A
+#  define VBOX_E_INVALID_SESSION_STATE 0x80BB000B
+#  define VBOX_E_OBJECT_IN_USE 0x80BB000C
+#  define VBOX_E_DONT_CALL_AGAIN 0x80BB000D


 struct IVirtualBoxErrorInfo;
@@ -996,8 +999,8 @@ typedef struct IPerformanceCollector IPerformanceCollector;
 typedef struct INATEngine INATEngine;

 /* Start of enum SettingsVersion Declaration */
-#define SETTINGSVERSION_IID_STR "52bd6f5f-1adb-4493-975d-581a9c4b803f"
-#define SETTINGSVERSION_IID { \
+#  define SETTINGSVERSION_IID_STR "52bd6f5f-1adb-4493-975d-581a9c4b803f"
+#  define SETTINGSVERSION_IID { \
     0x52bd6f5f, 0x1adb, 0x4493, \
     { 0x97, 0x5d, 0x58, 0x1a, 0x9c, 0x4b, 0x80, 0x3f } \
 }
@@ -1022,8 +1025,8 @@ enum SettingsVersion


 /* Start of enum AccessMode Declaration */
-#define ACCESSMODE_IID_STR "1da0007c-ddf7-4be8-bcac-d84a1558785f"
-#define ACCESSMODE_IID { \
+#  define ACCESSMODE_IID_STR "1da0007c-ddf7-4be8-bcac-d84a1558785f"
+#  define ACCESSMODE_IID { \
     0x1da0007c, 0xddf7, 0x4be8, \
     { 0xbc, 0xac, 0xd8, 0x4a, 0x15, 0x58, 0x78, 0x5f } \
 }
@@ -1036,8 +1039,8 @@ enum AccessMode


 /* Start of enum MachineState Declaration */
-#define MACHINESTATE_IID_STR "e998d075-543a-41fc-8aa9-5ca3e92393fd"
-#define MACHINESTATE_IID { \
+#  define MACHINESTATE_IID_STR "e998d075-543a-41fc-8aa9-5ca3e92393fd"
+#  define MACHINESTATE_IID { \
     0xe998d075, 0x543a, 0x41fc, \
     { 0x8a, 0xa9, 0x5c, 0xa3, 0xe9, 0x23, 0x93, 0xfd } \
 }
@@ -1073,8 +1076,8 @@ enum MachineState


 /* Start of enum SessionState Declaration */
-#define SESSIONSTATE_IID_STR "cf2700c0-ea4b-47ae-9725-7810114b94d8"
-#define SESSIONSTATE_IID { \
+#  define SESSIONSTATE_IID_STR "cf2700c0-ea4b-47ae-9725-7810114b94d8"
+#  define SESSIONSTATE_IID { \
     0xcf2700c0, 0xea4b, 0x47ae, \
     { 0x97, 0x25, 0x78, 0x10, 0x11, 0x4b, 0x94, 0xd8 } \
 }
@@ -1090,8 +1093,8 @@ enum SessionState


 /* Start of enum CPUPropertyType Declaration */
-#define CPUPROPERTYTYPE_IID_STR "24d356a6-2f45-4abd-b977-1cbe9c4701f5"
-#define CPUPROPERTYTYPE_IID { \
+#  define CPUPROPERTYTYPE_IID_STR "24d356a6-2f45-4abd-b977-1cbe9c4701f5"
+#  define CPUPROPERTYTYPE_IID { \
     0x24d356a6, 0x2f45, 0x4abd, \
     { 0xb9, 0x77, 0x1c, 0xbe, 0x9c, 0x47, 0x01, 0xf5 } \
 }
@@ -1105,8 +1108,8 @@ enum CPUPropertyType


 /* Start of enum HWVirtExPropertyType Declaration */
-#define HWVIRTEXPROPERTYTYPE_IID_STR "ce81dfdd-d2b8-4a90-bbea-40ee8b7ffcee"
-#define HWVIRTEXPROPERTYTYPE_IID { \
+#  define HWVIRTEXPROPERTYTYPE_IID_STR "ce81dfdd-d2b8-4a90-bbea-40ee8b7ffcee"
+#  define HWVIRTEXPROPERTYTYPE_IID { \
     0xce81dfdd, 0xd2b8, 0x4a90, \
     { 0xbb, 0xea, 0x40, 0xee, 0x8b, 0x7f, 0xfc, 0xee } \
 }
@@ -1123,8 +1126,8 @@ enum HWVirtExPropertyType


 /* Start of enum SessionType Declaration */
-#define SESSIONTYPE_IID_STR "A13C02CB-0C2C-421E-8317-AC0E8AAA153A"
-#define SESSIONTYPE_IID { \
+#  define SESSIONTYPE_IID_STR "A13C02CB-0C2C-421E-8317-AC0E8AAA153A"
+#  define SESSIONTYPE_IID { \
     0xA13C02CB, 0x0C2C, 0x421E, \
     { 0x83, 0x17, 0xAC, 0x0E, 0x8A, 0xAA, 0x15, 0x3A } \
 }
@@ -1139,8 +1142,8 @@ enum SessionType


 /* Start of enum DeviceType Declaration */
-#define DEVICETYPE_IID_STR "6d9420f7-0b56-4636-99f9-7346f1b01e57"
-#define DEVICETYPE_IID { \
+#  define DEVICETYPE_IID_STR "6d9420f7-0b56-4636-99f9-7346f1b01e57"
+#  define DEVICETYPE_IID { \
     0x6d9420f7, 0x0b56, 0x4636, \
     { 0x99, 0xf9, 0x73, 0x46, 0xf1, 0xb0, 0x1e, 0x57 } \
 }
@@ -1158,8 +1161,8 @@ enum DeviceType


 /* Start of enum DeviceActivity Declaration */
-#define DEVICEACTIVITY_IID_STR "6FC8AEAA-130A-4eb5-8954-3F921422D707"
-#define DEVICEACTIVITY_IID { \
+#  define DEVICEACTIVITY_IID_STR "6FC8AEAA-130A-4eb5-8954-3F921422D707"
+#  define DEVICEACTIVITY_IID { \
     0x6FC8AEAA, 0x130A, 0x4eb5, \
     { 0x89, 0x54, 0x3F, 0x92, 0x14, 0x22, 0xD7, 0x07 } \
 }
@@ -1174,8 +1177,8 @@ enum DeviceActivity


 /* Start of enum ClipboardMode Declaration */
-#define CLIPBOARDMODE_IID_STR "33364716-4008-4701-8f14-be0fa3d62950"
-#define CLIPBOARDMODE_IID { \
+#  define CLIPBOARDMODE_IID_STR "33364716-4008-4701-8f14-be0fa3d62950"
+#  define CLIPBOARDMODE_IID { \
     0x33364716, 0x4008, 0x4701, \
     { 0x8f, 0x14, 0xbe, 0x0f, 0xa3, 0xd6, 0x29, 0x50 } \
 }
@@ -1190,8 +1193,8 @@ enum ClipboardMode


 /* Start of enum Scope Declaration */
-#define SCOPE_IID_STR "7c91096e-499e-4eca-9f9b-9001438d7855"
-#define SCOPE_IID { \
+#  define SCOPE_IID_STR "7c91096e-499e-4eca-9f9b-9001438d7855"
+#  define SCOPE_IID { \
     0x7c91096e, 0x499e, 0x4eca, \
     { 0x9f, 0x9b, 0x90, 0x01, 0x43, 0x8d, 0x78, 0x55 } \
 }
@@ -1205,8 +1208,8 @@ enum Scope


 /* Start of enum BIOSBootMenuMode Declaration */
-#define BIOSBOOTMENUMODE_IID_STR "ae4fb9f7-29d2-45b4-b2c7-d579603135d5"
-#define BIOSBOOTMENUMODE_IID { \
+#  define BIOSBOOTMENUMODE_IID_STR "ae4fb9f7-29d2-45b4-b2c7-d579603135d5"
+#  define BIOSBOOTMENUMODE_IID { \
     0xae4fb9f7, 0x29d2, 0x45b4, \
     { 0xb2, 0xc7, 0xd5, 0x79, 0x60, 0x31, 0x35, 0xd5 } \
 }
@@ -1220,8 +1223,8 @@ enum BIOSBootMenuMode


 /* Start of enum ProcessorFeature Declaration */
-#define PROCESSORFEATURE_IID_STR "64c38e6b-8bcf-45ad-ac03-9b406287c5bf"
-#define PROCESSORFEATURE_IID { \
+#  define PROCESSORFEATURE_IID_STR "64c38e6b-8bcf-45ad-ac03-9b406287c5bf"
+#  define PROCESSORFEATURE_IID { \
     0x64c38e6b, 0x8bcf, 0x45ad, \
     { 0xac, 0x03, 0x9b, 0x40, 0x62, 0x87, 0xc5, 0xbf } \
 }
@@ -1236,8 +1239,8 @@ enum ProcessorFeature


 /* Start of enum FirmwareType Declaration */
-#define FIRMWARETYPE_IID_STR "b903f264-c230-483e-ac74-2b37ce60d371"
-#define FIRMWARETYPE_IID { \
+#  define FIRMWARETYPE_IID_STR "b903f264-c230-483e-ac74-2b37ce60d371"
+#  define FIRMWARETYPE_IID { \
     0xb903f264, 0xc230, 0x483e, \
     { 0xac, 0x74, 0x2b, 0x37, 0xce, 0x60, 0xd3, 0x71 } \
 }
@@ -1253,8 +1256,8 @@ enum FirmwareType


 /* Start of enum PointingHidType Declaration */
-#define POINTINGHIDTYPE_IID_STR "0d3c17a2-821a-4b2e-ae41-890c6c60aa97"
-#define POINTINGHIDTYPE_IID { \
+#  define POINTINGHIDTYPE_IID_STR "0d3c17a2-821a-4b2e-ae41-890c6c60aa97"
+#  define POINTINGHIDTYPE_IID { \
     0x0d3c17a2, 0x821a, 0x4b2e, \
     { 0xae, 0x41, 0x89, 0x0c, 0x6c, 0x60, 0xaa, 0x97 } \
 }
@@ -1270,8 +1273,8 @@ enum PointingHidType


 /* Start of enum KeyboardHidType Declaration */
-#define KEYBOARDHIDTYPE_IID_STR "5a5b0996-3a3e-44bb-9019-56979812cbcc"
-#define KEYBOARDHIDTYPE_IID { \
+#  define KEYBOARDHIDTYPE_IID_STR "5a5b0996-3a3e-44bb-9019-56979812cbcc"
+#  define KEYBOARDHIDTYPE_IID { \
     0x5a5b0996, 0x3a3e, 0x44bb, \
     { 0x90, 0x19, 0x56, 0x97, 0x98, 0x12, 0xcb, 0xcc } \
 }
@@ -1286,8 +1289,8 @@ enum KeyboardHidType


 /* Start of enum VFSType Declaration */
-#define VFSTYPE_IID_STR "813999ba-b949-48a8-9230-aadc6285e2f2"
-#define VFSTYPE_IID { \
+#  define VFSTYPE_IID_STR "813999ba-b949-48a8-9230-aadc6285e2f2"
+#  define VFSTYPE_IID { \
     0x813999ba, 0xb949, 0x48a8, \
     { 0x92, 0x30, 0xaa, 0xdc, 0x62, 0x85, 0xe2, 0xf2 } \
 }
@@ -1302,8 +1305,8 @@ enum VFSType


 /* Start of enum VFSFileType Declaration */
-#define VFSFILETYPE_IID_STR "714333cd-44e2-415f-a245-d378fa9b1242"
-#define VFSFILETYPE_IID { \
+#  define VFSFILETYPE_IID_STR "714333cd-44e2-415f-a245-d378fa9b1242"
+#  define VFSFILETYPE_IID { \
     0x714333cd, 0x44e2, 0x415f, \
     { 0xa2, 0x45, 0xd3, 0x78, 0xfa, 0x9b, 0x12, 0x42 } \
 }
@@ -1323,8 +1326,8 @@ enum VFSFileType


 /* Start of enum VirtualSystemDescriptionType Declaration */
-#define VIRTUALSYSTEMDESCRIPTIONTYPE_IID_STR "c0f8f135-3a1d-417d-afa6-b38b95a91f90"
-#define VIRTUALSYSTEMDESCRIPTIONTYPE_IID { \
+#  define VIRTUALSYSTEMDESCRIPTIONTYPE_IID_STR "c0f8f135-3a1d-417d-afa6-b38b95a91f90"
+#  define VIRTUALSYSTEMDESCRIPTIONTYPE_IID { \
     0xc0f8f135, 0x3a1d, 0x417d, \
     { 0xaf, 0xa6, 0xb3, 0x8b, 0x95, 0xa9, 0x1f, 0x90 } \
 }
@@ -1358,8 +1361,8 @@ enum VirtualSystemDescriptionType


 /* Start of enum VirtualSystemDescriptionValueType Declaration */
-#define VIRTUALSYSTEMDESCRIPTIONVALUETYPE_IID_STR "56d9403f-3425-4118-9919-36f2a9b8c77c"
-#define VIRTUALSYSTEMDESCRIPTIONVALUETYPE_IID { \
+#  define VIRTUALSYSTEMDESCRIPTIONVALUETYPE_IID_STR "56d9403f-3425-4118-9919-36f2a9b8c77c"
+#  define VIRTUALSYSTEMDESCRIPTIONVALUETYPE_IID { \
     0x56d9403f, 0x3425, 0x4118, \
     { 0x99, 0x19, 0x36, 0xf2, 0xa9, 0xb8, 0xc7, 0x7c } \
 }
@@ -1374,8 +1377,8 @@ enum VirtualSystemDescriptionValueType


 /* Start of enum HostNetworkInterfaceMediumType Declaration */
-#define HOSTNETWORKINTERFACEMEDIUMTYPE_IID_STR "1aa54aaf-2497-45a2-bfb1-8eb225e93d5b"
-#define HOSTNETWORKINTERFACEMEDIUMTYPE_IID { \
+#  define HOSTNETWORKINTERFACEMEDIUMTYPE_IID_STR "1aa54aaf-2497-45a2-bfb1-8eb225e93d5b"
+#  define HOSTNETWORKINTERFACEMEDIUMTYPE_IID { \
     0x1aa54aaf, 0x2497, 0x45a2, \
     { 0xbf, 0xb1, 0x8e, 0xb2, 0x25, 0xe9, 0x3d, 0x5b } \
 }
@@ -1390,8 +1393,8 @@ enum HostNetworkInterfaceMediumType


 /* Start of enum HostNetworkInterfaceStatus Declaration */
-#define HOSTNETWORKINTERFACESTATUS_IID_STR "CC474A69-2710-434B-8D99-C38E5D5A6F41"
-#define HOSTNETWORKINTERFACESTATUS_IID { \
+#  define HOSTNETWORKINTERFACESTATUS_IID_STR "CC474A69-2710-434B-8D99-C38E5D5A6F41"
+#  define HOSTNETWORKINTERFACESTATUS_IID { \
     0xCC474A69, 0x2710, 0x434B, \
     { 0x8D, 0x99, 0xC3, 0x8E, 0x5D, 0x5A, 0x6F, 0x41 } \
 }
@@ -1405,8 +1408,8 @@ enum HostNetworkInterfaceStatus


 /* Start of enum HostNetworkInterfaceType Declaration */
-#define HOSTNETWORKINTERFACETYPE_IID_STR "67431b00-9946-48a2-bc02-b25c5919f4f3"
-#define HOSTNETWORKINTERFACETYPE_IID { \
+#  define HOSTNETWORKINTERFACETYPE_IID_STR "67431b00-9946-48a2-bc02-b25c5919f4f3"
+#  define HOSTNETWORKINTERFACETYPE_IID { \
     0x67431b00, 0x9946, 0x48a2, \
     { 0xbc, 0x02, 0xb2, 0x5c, 0x59, 0x19, 0xf4, 0xf3 } \
 }
@@ -1419,8 +1422,8 @@ enum HostNetworkInterfaceType


 /* Start of enum MediumState Declaration */
-#define MEDIUMSTATE_IID_STR "ef41e980-e012-43cd-9dea-479d4ef14d13"
-#define MEDIUMSTATE_IID { \
+#  define MEDIUMSTATE_IID_STR "ef41e980-e012-43cd-9dea-479d4ef14d13"
+#  define MEDIUMSTATE_IID { \
     0xef41e980, 0xe012, 0x43cd, \
     { 0x9d, 0xea, 0x47, 0x9d, 0x4e, 0xf1, 0x4d, 0x13 } \
 }
@@ -1438,8 +1441,8 @@ enum MediumState


 /* Start of enum MediumType Declaration */
-#define MEDIUMTYPE_IID_STR "46bf1fd4-ad86-4ded-8c49-28bd2d148e5a"
-#define MEDIUMTYPE_IID { \
+#  define MEDIUMTYPE_IID_STR "46bf1fd4-ad86-4ded-8c49-28bd2d148e5a"
+#  define MEDIUMTYPE_IID { \
     0x46bf1fd4, 0xad86, 0x4ded, \
     { 0x8c, 0x49, 0x28, 0xbd, 0x2d, 0x14, 0x8e, 0x5a } \
 }
@@ -1454,8 +1457,8 @@ enum MediumType


 /* Start of enum MediumVariant Declaration */
-#define MEDIUMVARIANT_IID_STR "584ea502-143b-4ab0-ad14-d1028fdf0316"
-#define MEDIUMVARIANT_IID { \
+#  define MEDIUMVARIANT_IID_STR "584ea502-143b-4ab0-ad14-d1028fdf0316"
+#  define MEDIUMVARIANT_IID { \
     0x584ea502, 0x143b, 0x4ab0, \
     { 0xad, 0x14, 0xd1, 0x02, 0x8f, 0xdf, 0x03, 0x16 } \
 }
@@ -1472,8 +1475,8 @@ enum MediumVariant


 /* Start of enum DataType Declaration */
-#define DATATYPE_IID_STR "d90ea51e-a3f1-4a01-beb1-c1723c0d3ba7"
-#define DATATYPE_IID { \
+#  define DATATYPE_IID_STR "d90ea51e-a3f1-4a01-beb1-c1723c0d3ba7"
+#  define DATATYPE_IID { \
     0xd90ea51e, 0xa3f1, 0x4a01, \
     { 0xbe, 0xb1, 0xc1, 0x72, 0x3c, 0x0d, 0x3b, 0xa7 } \
 }
@@ -1487,8 +1490,8 @@ enum DataType


 /* Start of enum DataFlags Declaration */
-#define DATAFLAGS_IID_STR "86884dcf-1d6b-4f1b-b4bf-f5aa44959d60"
-#define DATAFLAGS_IID { \
+#  define DATAFLAGS_IID_STR "86884dcf-1d6b-4f1b-b4bf-f5aa44959d60"
+#  define DATAFLAGS_IID { \
     0x86884dcf, 0x1d6b, 0x4f1b, \
     { 0xb4, 0xbf, 0xf5, 0xaa, 0x44, 0x95, 0x9d, 0x60 } \
 }
@@ -1504,8 +1507,8 @@ enum DataFlags


 /* Start of enum MediumFormatCapabilities Declaration */
-#define MEDIUMFORMATCAPABILITIES_IID_STR "70fcf810-99e8-4edc-aee4-7f51d489e657"
-#define MEDIUMFORMATCAPABILITIES_IID { \
+#  define MEDIUMFORMATCAPABILITIES_IID_STR "70fcf810-99e8-4edc-aee4-7f51d489e657"
+#  define MEDIUMFORMATCAPABILITIES_IID { \
     0x70fcf810, 0x99e8, 0x4edc, \
     { 0xae, 0xe4, 0x7f, 0x51, 0xd4, 0x89, 0xe6, 0x57 } \
 }
@@ -1525,8 +1528,8 @@ enum MediumFormatCapabilities


 /* Start of enum MouseButtonState Declaration */
-#define MOUSEBUTTONSTATE_IID_STR "9ee094b8-b28a-4d56-a166-973cb588d7f8"
-#define MOUSEBUTTONSTATE_IID { \
+#  define MOUSEBUTTONSTATE_IID_STR "9ee094b8-b28a-4d56-a166-973cb588d7f8"
+#  define MOUSEBUTTONSTATE_IID { \
     0x9ee094b8, 0xb28a, 0x4d56, \
     { 0xa1, 0x66, 0x97, 0x3c, 0xb5, 0x88, 0xd7, 0xf8 } \
 }
@@ -1545,8 +1548,8 @@ enum MouseButtonState


 /* Start of enum FramebufferPixelFormat Declaration */
-#define FRAMEBUFFERPIXELFORMAT_IID_STR "7acfd5ed-29e3-45e3-8136-73c9224f3d2d"
-#define FRAMEBUFFERPIXELFORMAT_IID { \
+#  define FRAMEBUFFERPIXELFORMAT_IID_STR "7acfd5ed-29e3-45e3-8136-73c9224f3d2d"
+#  define FRAMEBUFFERPIXELFORMAT_IID { \
     0x7acfd5ed, 0x29e3, 0x45e3, \
     { 0x81, 0x36, 0x73, 0xc9, 0x22, 0x4f, 0x3d, 0x2d } \
 }
@@ -1559,8 +1562,8 @@ enum FramebufferPixelFormat


 /* Start of enum NetworkAttachmentType Declaration */
-#define NETWORKATTACHMENTTYPE_IID_STR "44bce1ee-99f7-4e8e-89fc-80597fd9eeaf"
-#define NETWORKATTACHMENTTYPE_IID { \
+#  define NETWORKATTACHMENTTYPE_IID_STR "44bce1ee-99f7-4e8e-89fc-80597fd9eeaf"
+#  define NETWORKATTACHMENTTYPE_IID { \
     0x44bce1ee, 0x99f7, 0x4e8e, \
     { 0x89, 0xfc, 0x80, 0x59, 0x7f, 0xd9, 0xee, 0xaf } \
 }
@@ -1577,8 +1580,8 @@ enum NetworkAttachmentType


 /* Start of enum NetworkAdapterType Declaration */
-#define NETWORKADAPTERTYPE_IID_STR "3c2281e4-d952-4e87-8c7d-24379cb6a81c"
-#define NETWORKADAPTERTYPE_IID { \
+#  define NETWORKADAPTERTYPE_IID_STR "3c2281e4-d952-4e87-8c7d-24379cb6a81c"
+#  define NETWORKADAPTERTYPE_IID { \
     0x3c2281e4, 0xd952, 0x4e87, \
     { 0x8c, 0x7d, 0x24, 0x37, 0x9c, 0xb6, 0xa8, 0x1c } \
 }
@@ -1596,8 +1599,8 @@ enum NetworkAdapterType


 /* Start of enum PortMode Declaration */
-#define PORTMODE_IID_STR "533b5fe3-0185-4197-86a7-17e37dd39d76"
-#define PORTMODE_IID { \
+#  define PORTMODE_IID_STR "533b5fe3-0185-4197-86a7-17e37dd39d76"
+#  define PORTMODE_IID { \
     0x533b5fe3, 0x0185, 0x4197, \
     { 0x86, 0xa7, 0x17, 0xe3, 0x7d, 0xd3, 0x9d, 0x76 } \
 }
@@ -1612,8 +1615,8 @@ enum PortMode


 /* Start of enum USBDeviceState Declaration */
-#define USBDEVICESTATE_IID_STR "b99a2e65-67fb-4882-82fd-f3e5e8193ab4"
-#define USBDEVICESTATE_IID { \
+#  define USBDEVICESTATE_IID_STR "b99a2e65-67fb-4882-82fd-f3e5e8193ab4"
+#  define USBDEVICESTATE_IID { \
     0xb99a2e65, 0x67fb, 0x4882, \
     { 0x82, 0xfd, 0xf3, 0xe5, 0xe8, 0x19, 0x3a, 0xb4 } \
 }
@@ -1630,8 +1633,8 @@ enum USBDeviceState


 /* Start of enum USBDeviceFilterAction Declaration */
-#define USBDEVICEFILTERACTION_IID_STR "cbc30a49-2f4e-43b5-9da6-121320475933"
-#define USBDEVICEFILTERACTION_IID { \
+#  define USBDEVICEFILTERACTION_IID_STR "cbc30a49-2f4e-43b5-9da6-121320475933"
+#  define USBDEVICEFILTERACTION_IID { \
     0xcbc30a49, 0x2f4e, 0x43b5, \
     { 0x9d, 0xa6, 0x12, 0x13, 0x20, 0x47, 0x59, 0x33 } \
 }
@@ -1645,8 +1648,8 @@ enum USBDeviceFilterAction


 /* Start of enum AudioDriverType Declaration */
-#define AUDIODRIVERTYPE_IID_STR "4bcc3d73-c2fe-40db-b72f-0c2ca9d68496"
-#define AUDIODRIVERTYPE_IID { \
+#  define AUDIODRIVERTYPE_IID_STR "4bcc3d73-c2fe-40db-b72f-0c2ca9d68496"
+#  define AUDIODRIVERTYPE_IID { \
     0x4bcc3d73, 0xc2fe, 0x40db, \
     { 0xb7, 0x2f, 0x0c, 0x2c, 0xa9, 0xd6, 0x84, 0x96 } \
 }
@@ -1666,8 +1669,8 @@ enum AudioDriverType


 /* Start of enum AudioControllerType Declaration */
-#define AUDIOCONTROLLERTYPE_IID_STR "7afd395c-42c3-444e-8788-3ce80292f36c"
-#define AUDIOCONTROLLERTYPE_IID { \
+#  define AUDIOCONTROLLERTYPE_IID_STR "7afd395c-42c3-444e-8788-3ce80292f36c"
+#  define AUDIOCONTROLLERTYPE_IID { \
     0x7afd395c, 0x42c3, 0x444e, \
     { 0x87, 0x88, 0x3c, 0xe8, 0x02, 0x92, 0xf3, 0x6c } \
 }
@@ -1680,8 +1683,8 @@ enum AudioControllerType


 /* Start of enum VRDPAuthType Declaration */
-#define VRDPAUTHTYPE_IID_STR "3d91887a-b67f-4b33-85bf-2da7ab1ea83a"
-#define VRDPAUTHTYPE_IID { \
+#  define VRDPAUTHTYPE_IID_STR "3d91887a-b67f-4b33-85bf-2da7ab1ea83a"
+#  define VRDPAUTHTYPE_IID { \
     0x3d91887a, 0xb67f, 0x4b33, \
     { 0x85, 0xbf, 0x2d, 0xa7, 0xab, 0x1e, 0xa8, 0x3a } \
 }
@@ -1695,8 +1698,8 @@ enum VRDPAuthType


 /* Start of enum StorageBus Declaration */
-#define STORAGEBUS_IID_STR "eee67ab3-668d-4ef5-91e0-7025fe4a0d7a"
-#define STORAGEBUS_IID { \
+#  define STORAGEBUS_IID_STR "eee67ab3-668d-4ef5-91e0-7025fe4a0d7a"
+#  define STORAGEBUS_IID { \
     0xeee67ab3, 0x668d, 0x4ef5, \
     { 0x91, 0xe0, 0x70, 0x25, 0xfe, 0x4a, 0x0d, 0x7a } \
 }
@@ -1713,8 +1716,8 @@ enum StorageBus


 /* Start of enum StorageControllerType Declaration */
-#define STORAGECONTROLLERTYPE_IID_STR "8a412b8a-f43e-4456-bd37-b474f0879a58"
-#define STORAGECONTROLLERTYPE_IID { \
+#  define STORAGECONTROLLERTYPE_IID_STR "8a412b8a-f43e-4456-bd37-b474f0879a58"
+#  define STORAGECONTROLLERTYPE_IID { \
     0x8a412b8a, 0xf43e, 0x4456, \
     { 0xbd, 0x37, 0xb4, 0x74, 0xf0, 0x87, 0x9a, 0x58 } \
 }
@@ -1734,8 +1737,8 @@ enum StorageControllerType


 /* Start of enum NATAliasMode Declaration */
-#define NATALIASMODE_IID_STR "67772168-50d9-11df-9669-7fb714ee4fa1"
-#define NATALIASMODE_IID { \
+#  define NATALIASMODE_IID_STR "67772168-50d9-11df-9669-7fb714ee4fa1"
+#  define NATALIASMODE_IID { \
     0x67772168, 0x50d9, 0x11df, \
     { 0x96, 0x69, 0x7f, 0xb7, 0x14, 0xee, 0x4f, 0xa1 } \
 }
@@ -1749,8 +1752,8 @@ enum NATAliasMode


 /* Start of enum NATProtocol Declaration */
-#define NATPROTOCOL_IID_STR "e90164be-eb03-11de-94af-fff9b1c1b19f"
-#define NATPROTOCOL_IID { \
+#  define NATPROTOCOL_IID_STR "e90164be-eb03-11de-94af-fff9b1c1b19f"
+#  define NATPROTOCOL_IID { \
     0xe90164be, 0xeb03, 0x11de, \
     { 0x94, 0xaf, 0xff, 0xf9, 0xb1, 0xc1, 0xb1, 0x9f } \
 }
@@ -1763,8 +1766,8 @@ enum NATProtocol


 /* Start of struct IVirtualBoxErrorInfo Declaration */
-#define IVIRTUALBOXERRORINFO_IID_STR "4b86d186-407e-4f9e-8be8-e50061be8725"
-#define IVIRTUALBOXERRORINFO_IID { \
+#  define IVIRTUALBOXERRORINFO_IID_STR "4b86d186-407e-4f9e-8be8-e50061be8725"
+#  define IVIRTUALBOXERRORINFO_IID { \
     0x4b86d186, 0x407e, 0x4f9e, \
     { 0x8b, 0xe8, 0xe5, 0x00, 0x61, 0xbe, 0x87, 0x25 } \
 }
@@ -1792,8 +1795,8 @@ struct IVirtualBoxErrorInfo


 /* Start of struct ILocalOwner Declaration */
-#define ILOCALOWNER_IID_STR "308FF42A-DC45-49D4-A950-B1EEE5E00BB5"
-#define ILOCALOWNER_IID { \
+#  define ILOCALOWNER_IID_STR "308FF42A-DC45-49D4-A950-B1EEE5E00BB5"
+#  define ILOCALOWNER_IID { \
     0x308FF42A, 0xDC45, 0x49D4, \
     { 0xA9, 0x50, 0xB1, 0xEE, 0xE5, 0xE0, 0x0B, 0xB5 } \
 }
@@ -1816,8 +1819,8 @@ struct ILocalOwner


 /* Start of struct IVirtualBoxCallback Declaration */
-#define IVIRTUALBOXCALLBACK_IID_STR "7f6a65b6-ad5d-4a67-8872-0b11cb7ea95c"
-#define IVIRTUALBOXCALLBACK_IID { \
+#  define IVIRTUALBOXCALLBACK_IID_STR "7f6a65b6-ad5d-4a67-8872-0b11cb7ea95c"
+#  define IVIRTUALBOXCALLBACK_IID { \
     0x7f6a65b6, 0xad5d, 0x4a67, \
     { 0x88, 0x72, 0x0b, 0x11, 0xcb, 0x7e, 0xa9, 0x5c } \
 }
@@ -1907,8 +1910,8 @@ struct IVirtualBoxCallback


 /* Start of struct IDHCPServer Declaration */
-#define IDHCPSERVER_IID_STR "6cfe387c-74fb-4ca7-bff6-973bec8af7a3"
-#define IDHCPSERVER_IID { \
+#  define IDHCPSERVER_IID_STR "6cfe387c-74fb-4ca7-bff6-973bec8af7a3"
+#  define IDHCPSERVER_IID { \
     0x6cfe387c, 0x74fb, 0x4ca7, \
     { 0xbf, 0xf6, 0x97, 0x3b, 0xec, 0x8a, 0xf7, 0xa3 } \
 }
@@ -1956,8 +1959,8 @@ struct IDHCPServer


 /* Start of struct IVirtualBox Declaration */
-#define IVIRTUALBOX_IID_STR "3f36e024-7fed-4f20-a02c-9158a82b44e6"
-#define IVIRTUALBOX_IID { \
+#  define IVIRTUALBOX_IID_STR "3f36e024-7fed-4f20-a02c-9158a82b44e6"
+#  define IVIRTUALBOX_IID { \
     0x3f36e024, 0x7fed, 0x4f20, \
     { 0xa0, 0x2c, 0x91, 0x58, 0xa8, 0x2b, 0x44, 0xe6 } \
 }
@@ -2229,8 +2232,8 @@ struct IVirtualBox


 /* Start of struct IVFSExplorer Declaration */
-#define IVFSEXPLORER_IID_STR "2bb864a1-02a3-4474-a1d4-fb5f23b742e1"
-#define IVFSEXPLORER_IID { \
+#  define IVFSEXPLORER_IID_STR "2bb864a1-02a3-4474-a1d4-fb5f23b742e1"
+#  define IVFSEXPLORER_IID { \
     0x2bb864a1, 0x02a3, 0x4474, \
     { 0xa1, 0xd4, 0xfb, 0x5f, 0x23, 0xb7, 0x42, 0xe1 } \
 }
@@ -2291,8 +2294,8 @@ struct IVFSExplorer


 /* Start of struct IAppliance Declaration */
-#define IAPPLIANCE_IID_STR "e3ba9ab9-ac2c-4266-8bd2-91c4bf721ceb"
-#define IAPPLIANCE_IID { \
+#  define IAPPLIANCE_IID_STR "e3ba9ab9-ac2c-4266-8bd2-91c4bf721ceb"
+#  define IAPPLIANCE_IID { \
     0xe3ba9ab9, 0xac2c, 0x4266, \
     { 0x8b, 0xd2, 0x91, 0xc4, 0xbf, 0x72, 0x1c, 0xeb } \
 }
@@ -2348,8 +2351,8 @@ struct IAppliance


 /* Start of struct IVirtualSystemDescription Declaration */
-#define IVIRTUALSYSTEMDESCRIPTION_IID_STR "d7525e6c-531a-4c51-8e04-41235083a3d8"
-#define IVIRTUALSYSTEMDESCRIPTION_IID { \
+#  define IVIRTUALSYSTEMDESCRIPTION_IID_STR "d7525e6c-531a-4c51-8e04-41235083a3d8"
+#  define IVIRTUALSYSTEMDESCRIPTION_IID { \
     0xd7525e6c, 0x531a, 0x4c51, \
     { 0x8e, 0x04, 0x41, 0x23, 0x50, 0x83, 0xa3, 0xd8 } \
 }
@@ -2423,8 +2426,8 @@ struct IVirtualSystemDescription


 /* Start of struct IInternalMachineControl Declaration */
-#define IINTERNALMACHINECONTROL_IID_STR "57e9a280-8d57-4331-aa31-f009f5194f52"
-#define IINTERNALMACHINECONTROL_IID { \
+#  define IINTERNALMACHINECONTROL_IID_STR "57e9a280-8d57-4331-aa31-f009f5194f52"
+#  define IINTERNALMACHINECONTROL_IID { \
     0x57e9a280, 0x8d57, 0x4331, \
     { 0xaa, 0x31, 0xf0, 0x09, 0xf5, 0x19, 0x4f, 0x52 } \
 }
@@ -2575,8 +2578,8 @@ struct IInternalMachineControl


 /* Start of struct IBIOSSettings Declaration */
-#define IBIOSSETTINGS_IID_STR "38b54279-dc35-4f5e-a431-835b867c6b5e"
-#define IBIOSSETTINGS_IID { \
+#  define IBIOSSETTINGS_IID_STR "38b54279-dc35-4f5e-a431-835b867c6b5e"
+#  define IBIOSSETTINGS_IID { \
     0x38b54279, 0xdc35, 0x4f5e, \
     { 0xa4, 0x31, 0x83, 0x5b, 0x86, 0x7c, 0x6b, 0x5e } \
 }
@@ -2621,8 +2624,8 @@ struct IBIOSSettings


 /* Start of struct IMachine Declaration */
-#define IMACHINE_IID_STR "6d9212cb-a5c0-48b7-bbc1-3fa2ba2ee6d2"
-#define IMACHINE_IID { \
+#  define IMACHINE_IID_STR "6d9212cb-a5c0-48b7-bbc1-3fa2ba2ee6d2"
+#  define IMACHINE_IID { \
     0x6d9212cb, 0xa5c0, 0x48b7, \
     { 0xbb, 0xc1, 0x3f, 0xa2, 0xba, 0x2e, 0xe6, 0xd2 } \
 }
@@ -3113,8 +3116,8 @@ struct IMachine


 /* Start of struct IConsoleCallback Declaration */
-#define ICONSOLECALLBACK_IID_STR "60703f8d-81e4-4b45-a147-dcfd07692b19"
-#define ICONSOLECALLBACK_IID { \
+#  define ICONSOLECALLBACK_IID_STR "60703f8d-81e4-4b45-a147-dcfd07692b19"
+#  define ICONSOLECALLBACK_IID { \
     0x60703f8d, 0x81e4, 0x4b45, \
     { 0xa1, 0x47, 0xdc, 0xfd, 0x07, 0x69, 0x2b, 0x19 } \
 }
@@ -3228,8 +3231,8 @@ struct IConsoleCallback


 /* Start of struct IRemoteDisplayInfo Declaration */
-#define IREMOTEDISPLAYINFO_IID_STR "b3741084-806f-4c3b-8c42-ebad1a81e45a"
-#define IREMOTEDISPLAYINFO_IID { \
+#  define IREMOTEDISPLAYINFO_IID_STR "b3741084-806f-4c3b-8c42-ebad1a81e45a"
+#  define IREMOTEDISPLAYINFO_IID { \
     0xb3741084, 0x806f, 0x4c3b, \
     { 0x8c, 0x42, 0xeb, 0xad, 0x1a, 0x81, 0xe4, 0x5a } \
 }
@@ -3277,8 +3280,8 @@ struct IRemoteDisplayInfo


 /* Start of struct IConsole Declaration */
-#define ICONSOLE_IID_STR "6375231a-c17c-464b-92cb-ae9e128d71c3"
-#define ICONSOLE_IID { \
+#  define ICONSOLE_IID_STR "6375231a-c17c-464b-92cb-ae9e128d71c3"
+#  define ICONSOLE_IID { \
     0x6375231a, 0xc17c, 0x464b, \
     { 0x92, 0xcb, 0xae, 0x9e, 0x12, 0x8d, 0x71, 0xc3 } \
 }
@@ -3447,8 +3450,8 @@ struct IConsole


 /* Start of struct IHostNetworkInterface Declaration */
-#define IHOSTNETWORKINTERFACE_IID_STR "ce6fae58-7642-4102-b5db-c9005c2320a8"
-#define IHOSTNETWORKINTERFACE_IID { \
+#  define IHOSTNETWORKINTERFACE_IID_STR "ce6fae58-7642-4102-b5db-c9005c2320a8"
+#  define IHOSTNETWORKINTERFACE_IID { \
     0xce6fae58, 0x7642, 0x4102, \
     { 0xb5, 0xdb, 0xc9, 0x00, 0x5c, 0x23, 0x20, 0xa8 } \
 }
@@ -3508,8 +3511,8 @@ struct IHostNetworkInterface


 /* Start of struct IHost Declaration */
-#define IHOST_IID_STR "35b004f4-7806-4009-bfa8-d1308adba7e5"
-#define IHOST_IID { \
+#  define IHOST_IID_STR "35b004f4-7806-4009-bfa8-d1308adba7e5"
+#  define IHOST_IID { \
     0x35b004f4, 0x7806, 0x4009, \
     { 0xbf, 0xa8, 0xd1, 0x30, 0x8a, 0xdb, 0xa7, 0xe5 } \
 }
@@ -3656,8 +3659,8 @@ struct IHost


 /* Start of struct ISystemProperties Declaration */
-#define ISYSTEMPROPERTIES_IID_STR "07c3ffd8-8f59-49cc-b608-53a332e85cc3"
-#define ISYSTEMPROPERTIES_IID { \
+#  define ISYSTEMPROPERTIES_IID_STR "07c3ffd8-8f59-49cc-b608-53a332e85cc3"
+#  define ISYSTEMPROPERTIES_IID { \
     0x07c3ffd8, 0x8f59, 0x49cc, \
     { 0xb6, 0x08, 0x53, 0xa3, 0x32, 0xe8, 0x5c, 0xc3 } \
 }
@@ -3764,8 +3767,8 @@ struct ISystemProperties


 /* Start of struct IGuestOSType Declaration */
-#define IGUESTOSTYPE_IID_STR "e3f6727e-a09b-41ea-a824-864a176472f3"
-#define IGUESTOSTYPE_IID { \
+#  define IGUESTOSTYPE_IID_STR "e3f6727e-a09b-41ea-a824-864a176472f3"
+#  define IGUESTOSTYPE_IID { \
     0xe3f6727e, 0xa09b, 0x41ea, \
     { 0xa8, 0x24, 0x86, 0x4a, 0x17, 0x64, 0x72, 0xf3 } \
 }
@@ -3825,8 +3828,8 @@ struct IGuestOSType


 /* Start of struct IGuest Declaration */
-#define IGUEST_IID_STR "d915dff1-ed38-495a-91f1-ab6c53932468"
-#define IGUEST_IID { \
+#  define IGUEST_IID_STR "d915dff1-ed38-495a-91f1-ab6c53932468"
+#  define IGUEST_IID { \
     0xd915dff1, 0xed38, 0x495a, \
     { 0x91, 0xf1, 0xab, 0x6c, 0x53, 0x93, 0x24, 0x68 } \
 }
@@ -3921,8 +3924,8 @@ struct IGuest


 /* Start of struct IProgress Declaration */
-#define IPROGRESS_IID_STR "856aa038-853f-42e2-acf7-6e7b02dbe294"
-#define IPROGRESS_IID { \
+#  define IPROGRESS_IID_STR "856aa038-853f-42e2-acf7-6e7b02dbe294"
+#  define IPROGRESS_IID { \
     0x856aa038, 0x853f, 0x42e2, \
     { 0xac, 0xf7, 0x6e, 0x7b, 0x02, 0xdb, 0xe2, 0x94 } \
 }
@@ -3995,8 +3998,8 @@ struct IProgress


 /* Start of struct ISnapshot Declaration */
-#define ISNAPSHOT_IID_STR "1a2d0551-58a4-4107-857e-ef414fc42ffc"
-#define ISNAPSHOT_IID { \
+#  define ISNAPSHOT_IID_STR "1a2d0551-58a4-4107-857e-ef414fc42ffc"
+#  define ISNAPSHOT_IID { \
     0x1a2d0551, 0x58a4, 0x4107, \
     { 0x85, 0x7e, 0xef, 0x41, 0x4f, 0xc4, 0x2f, 0xfc } \
 }
@@ -4032,8 +4035,8 @@ struct ISnapshot


 /* Start of struct IMediumAttachment Declaration */
-#define IMEDIUMATTACHMENT_IID_STR "e58eb3eb-8627-428b-bdf8-34487c848de5"
-#define IMEDIUMATTACHMENT_IID { \
+#  define IMEDIUMATTACHMENT_IID_STR "e58eb3eb-8627-428b-bdf8-34487c848de5"
+#  define IMEDIUMATTACHMENT_IID { \
     0xe58eb3eb, 0x8627, 0x428b, \
     { 0xbd, 0xf8, 0x34, 0x48, 0x7c, 0x84, 0x8d, 0xe5 } \
 }
@@ -4063,8 +4066,8 @@ struct IMediumAttachment


 /* Start of struct IMedium Declaration */
-#define IMEDIUM_IID_STR "1d578f43-5ef1-4415-b556-7592d3ccdc8f"
-#define IMEDIUM_IID { \
+#  define IMEDIUM_IID_STR "1d578f43-5ef1-4415-b556-7592d3ccdc8f"
+#  define IMEDIUM_IID { \
     0x1d578f43, 0x5ef1, 0x4415, \
     { 0xb5, 0x56, 0x75, 0x92, 0xd3, 0xcc, 0xdc, 0x8f } \
 }
@@ -4236,8 +4239,8 @@ struct IMedium


 /* Start of struct IMediumFormat Declaration */
-#define IMEDIUMFORMAT_IID_STR "89f52554-d469-4799-9fad-1705e86a08b1"
-#define IMEDIUMFORMAT_IID { \
+#  define IMEDIUMFORMAT_IID_STR "89f52554-d469-4799-9fad-1705e86a08b1"
+#  define IMEDIUMFORMAT_IID { \
     0x89f52554, 0xd469, 0x4799, \
     { 0x9f, 0xad, 0x17, 0x05, 0xe8, 0x6a, 0x08, 0xb1 } \
 }
@@ -4277,8 +4280,8 @@ struct IMediumFormat


 /* Start of struct IKeyboard Declaration */
-#define IKEYBOARD_IID_STR "2d1a531b-4c6e-49cc-8af6-5c857b78b5d7"
-#define IKEYBOARD_IID { \
+#  define IKEYBOARD_IID_STR "2d1a531b-4c6e-49cc-8af6-5c857b78b5d7"
+#  define IKEYBOARD_IID { \
     0x2d1a531b, 0x4c6e, 0x49cc, \
     { 0x8a, 0xf6, 0x5c, 0x85, 0x7b, 0x78, 0xb5, 0xd7 } \
 }
@@ -4310,8 +4313,8 @@ struct IKeyboard


 /* Start of struct IMouse Declaration */
-#define IMOUSE_IID_STR "7c0f2eae-f92d-498c-b802-e1a3763774dc"
-#define IMOUSE_IID { \
+#  define IMOUSE_IID_STR "7c0f2eae-f92d-498c-b802-e1a3763774dc"
+#  define IMOUSE_IID { \
     0x7c0f2eae, 0xf92d, 0x498c, \
     { 0xb8, 0x02, 0xe1, 0xa3, 0x76, 0x37, 0x74, 0xdc } \
 }
@@ -4353,8 +4356,8 @@ struct IMouse


 /* Start of struct IFramebuffer Declaration */
-#define IFRAMEBUFFER_IID_STR "b7ed347a-5765-40a0-ae1c-f543eb4ddeaf"
-#define IFRAMEBUFFER_IID { \
+#  define IFRAMEBUFFER_IID_STR "b7ed347a-5765-40a0-ae1c-f543eb4ddeaf"
+#  define IFRAMEBUFFER_IID { \
     0xb7ed347a, 0x5765, 0x40a0, \
     { 0xae, 0x1c, 0xf5, 0x43, 0xeb, 0x4d, 0xde, 0xaf } \
 }
@@ -4442,8 +4445,8 @@ struct IFramebuffer


 /* Start of struct IFramebufferOverlay Declaration */
-#define IFRAMEBUFFEROVERLAY_IID_STR "0bcc1c7e-e415-47d2-bfdb-e4c705fb0f47"
-#define IFRAMEBUFFEROVERLAY_IID { \
+#  define IFRAMEBUFFEROVERLAY_IID_STR "0bcc1c7e-e415-47d2-bfdb-e4c705fb0f47"
+#  define IFRAMEBUFFEROVERLAY_IID { \
     0x0bcc1c7e, 0xe415, 0x47d2, \
     { 0xbf, 0xdb, 0xe4, 0xc7, 0x05, 0xfb, 0x0f, 0x47 } \
 }
@@ -4477,8 +4480,8 @@ struct IFramebufferOverlay


 /* Start of struct IDisplay Declaration */
-#define IDISPLAY_IID_STR "1fa79e39-0cc9-4ab3-9df3-ed3e96b42496"
-#define IDISPLAY_IID { \
+#  define IDISPLAY_IID_STR "1fa79e39-0cc9-4ab3-9df3-ed3e96b42496"
+#  define IDISPLAY_IID { \
     0x1fa79e39, 0x0cc9, 0x4ab3, \
     { 0x9d, 0xf3, 0xed, 0x3e, 0x96, 0xb4, 0x24, 0x96 } \
 }
@@ -4570,8 +4573,8 @@ struct IDisplay


 /* Start of struct INetworkAdapter Declaration */
-#define INETWORKADAPTER_IID_STR "5bdb9df8-a5e1-4322-a139-b7a4a734c790"
-#define INETWORKADAPTER_IID { \
+#  define INETWORKADAPTER_IID_STR "5bdb9df8-a5e1-4322-a139-b7a4a734c790"
+#  define INETWORKADAPTER_IID { \
     0x5bdb9df8, 0xa5e1, 0x4322, \
     { 0xa1, 0x39, 0xb7, 0xa4, 0xa7, 0x34, 0xc7, 0x90 } \
 }
@@ -4643,8 +4646,8 @@ struct INetworkAdapter


 /* Start of struct ISerialPort Declaration */
-#define ISERIALPORT_IID_STR "937f6970-5103-4745-b78e-d28dcf1479a8"
-#define ISERIALPORT_IID { \
+#  define ISERIALPORT_IID_STR "937f6970-5103-4745-b78e-d28dcf1479a8"
+#  define ISERIALPORT_IID { \
     0x937f6970, 0x5103, 0x4745, \
     { 0xb7, 0x8e, 0xd2, 0x8d, 0xcf, 0x14, 0x79, 0xa8 } \
 }
@@ -4682,8 +4685,8 @@ struct ISerialPort


 /* Start of struct IParallelPort Declaration */
-#define IPARALLELPORT_IID_STR "0c925f06-dd10-4b77-8de8-294d738c3214"
-#define IPARALLELPORT_IID { \
+#  define IPARALLELPORT_IID_STR "0c925f06-dd10-4b77-8de8-294d738c3214"
+#  define IPARALLELPORT_IID { \
     0x0c925f06, 0xdd10, 0x4b77, \
     { 0x8d, 0xe8, 0x29, 0x4d, 0x73, 0x8c, 0x32, 0x14 } \
 }
@@ -4715,8 +4718,8 @@ struct IParallelPort


 /* Start of struct IMachineDebugger Declaration */
-#define IMACHINEDEBUGGER_IID_STR "b0b2a2dd-0627-4502-91c2-ddc5e77609e0"
-#define IMACHINEDEBUGGER_IID { \
+#  define IMACHINEDEBUGGER_IID_STR "b0b2a2dd-0627-4502-91c2-ddc5e77609e0"
+#  define IMACHINEDEBUGGER_IID { \
     0xb0b2a2dd, 0x0627, 0x4502, \
     { 0x91, 0xc2, 0xdd, 0xc5, 0xe7, 0x76, 0x09, 0xe0 } \
 }
@@ -4784,8 +4787,8 @@ struct IMachineDebugger


 /* Start of struct IUSBController Declaration */
-#define IUSBCONTROLLER_IID_STR "6fdcccc5-abd3-4fec-9387-2ad3914fc4a8"
-#define IUSBCONTROLLER_IID { \
+#  define IUSBCONTROLLER_IID_STR "6fdcccc5-abd3-4fec-9387-2ad3914fc4a8"
+#  define IUSBCONTROLLER_IID { \
     0x6fdcccc5, 0xabd3, 0x4fec, \
     { 0x93, 0x87, 0x2a, 0xd3, 0x91, 0x4f, 0xc4, 0xa8 } \
 }
@@ -4833,8 +4836,8 @@ struct IUSBController


 /* Start of struct IUSBDevice Declaration */
-#define IUSBDEVICE_IID_STR "f8967b0b-4483-400f-92b5-8b675d98a85b"
-#define IUSBDEVICE_IID { \
+#  define IUSBDEVICE_IID_STR "f8967b0b-4483-400f-92b5-8b675d98a85b"
+#  define IUSBDEVICE_IID { \
     0xf8967b0b, 0x4483, 0x400f, \
     { 0x92, 0xb5, 0x8b, 0x67, 0x5d, 0x98, 0xa8, 0x5b } \
 }
@@ -4876,8 +4879,8 @@ struct IUSBDevice


 /* Start of struct IUSBDeviceFilter Declaration */
-#define IUSBDEVICEFILTER_IID_STR "d6831fb4-1a94-4c2c-96ef-8d0d6192066d"
-#define IUSBDEVICEFILTER_IID { \
+#  define IUSBDEVICEFILTER_IID_STR "d6831fb4-1a94-4c2c-96ef-8d0d6192066d"
+#  define IUSBDEVICEFILTER_IID { \
     0xd6831fb4, 0x1a94, 0x4c2c, \
     { 0x96, 0xef, 0x8d, 0x0d, 0x61, 0x92, 0x06, 0x6d } \
 }
@@ -4928,8 +4931,8 @@ struct IUSBDeviceFilter


 /* Start of struct IHostUSBDevice Declaration */
-#define IHOSTUSBDEVICE_IID_STR "173b4b44-d268-4334-a00d-b6521c9a740a"
-#define IHOSTUSBDEVICE_IID { \
+#  define IHOSTUSBDEVICE_IID_STR "173b4b44-d268-4334-a00d-b6521c9a740a"
+#  define IHOSTUSBDEVICE_IID { \
     0x173b4b44, 0xd268, 0x4334, \
     { 0xa0, 0x0d, 0xb6, 0x52, 0x1c, 0x9a, 0x74, 0x0a } \
 }
@@ -4949,8 +4952,8 @@ struct IHostUSBDevice


 /* Start of struct IHostUSBDeviceFilter Declaration */
-#define IHOSTUSBDEVICEFILTER_IID_STR "4cc70246-d74a-400f-8222-3900489c0374"
-#define IHOSTUSBDEVICEFILTER_IID { \
+#  define IHOSTUSBDEVICEFILTER_IID_STR "4cc70246-d74a-400f-8222-3900489c0374"
+#  define IHOSTUSBDEVICEFILTER_IID { \
     0x4cc70246, 0xd74a, 0x400f, \
     { 0x82, 0x22, 0x39, 0x00, 0x48, 0x9c, 0x03, 0x74 } \
 }
@@ -4971,8 +4974,8 @@ struct IHostUSBDeviceFilter


 /* Start of struct IAudioAdapter Declaration */
-#define IAUDIOADAPTER_IID_STR "921873db-5f3f-4b69-91f9-7be9e535a2cb"
-#define IAUDIOADAPTER_IID { \
+#  define IAUDIOADAPTER_IID_STR "921873db-5f3f-4b69-91f9-7be9e535a2cb"
+#  define IAUDIOADAPTER_IID { \
     0x921873db, 0x5f3f, 0x4b69, \
     { 0x91, 0xf9, 0x7b, 0xe9, 0xe5, 0x35, 0xa2, 0xcb } \
 }
@@ -4999,8 +5002,8 @@ struct IAudioAdapter


 /* Start of struct IVRDPServer Declaration */
-#define IVRDPSERVER_IID_STR "7aeeb530-0b08-41fe-835d-9be9ec1dbe5c"
-#define IVRDPSERVER_IID { \
+#  define IVRDPSERVER_IID_STR "7aeeb530-0b08-41fe-835d-9be9ec1dbe5c"
+#  define IVRDPSERVER_IID { \
     0x7aeeb530, 0x0b08, 0x41fe, \
     { 0x83, 0x5d, 0x9b, 0xe9, 0xec, 0x1d, 0xbe, 0x5c } \
 }
@@ -5045,8 +5048,8 @@ struct IVRDPServer


 /* Start of struct ISharedFolder Declaration */
-#define ISHAREDFOLDER_IID_STR "64637bb2-9e17-471c-b8f3-f8968dd9884e"
-#define ISHAREDFOLDER_IID { \
+#  define ISHAREDFOLDER_IID_STR "64637bb2-9e17-471c-b8f3-f8968dd9884e"
+#  define ISHAREDFOLDER_IID { \
     0x64637bb2, 0x9e17, 0x471c, \
     { 0xb8, 0xf3, 0xf8, 0x96, 0x8d, 0xd9, 0x88, 0x4e } \
 }
@@ -5074,8 +5077,8 @@ struct ISharedFolder


 /* Start of struct IInternalSessionControl Declaration */
-#define IINTERNALSESSIONCONTROL_IID_STR "ab161f72-e4b3-44e6-a919-2256474bda66"
-#define IINTERNALSESSIONCONTROL_IID { \
+#  define IINTERNALSESSIONCONTROL_IID_STR "ab161f72-e4b3-44e6-a919-2256474bda66"
+#  define IINTERNALSESSIONCONTROL_IID { \
     0xab161f72, 0xe4b3, 0x44e6, \
     { 0xa9, 0x19, 0x22, 0x56, 0x47, 0x4b, 0xda, 0x66 } \
 }
@@ -5221,8 +5224,8 @@ struct IInternalSessionControl


 /* Start of struct ISession Declaration */
-#define ISESSION_IID_STR "12F4DCDB-12B2-4EC1-B7CD-DDD9F6C5BF4D"
-#define ISESSION_IID { \
+#  define ISESSION_IID_STR "12F4DCDB-12B2-4EC1-B7CD-DDD9F6C5BF4D"
+#  define ISESSION_IID { \
     0x12F4DCDB, 0x12B2, 0x4EC1, \
     { 0xB7, 0xCD, 0xDD, 0xD9, 0xF6, 0xC5, 0xBF, 0x4D } \
 }
@@ -5250,8 +5253,8 @@ struct ISession


 /* Start of struct IStorageController Declaration */
-#define ISTORAGECONTROLLER_IID_STR "fd93adc0-bbaa-4256-9e6e-00e29f9151c9"
-#define ISTORAGECONTROLLER_IID { \
+#  define ISTORAGECONTROLLER_IID_STR "fd93adc0-bbaa-4256-9e6e-00e29f9151c9"
+#  define ISTORAGECONTROLLER_IID { \
     0xfd93adc0, 0xbbaa, 0x4256, \
     { 0x9e, 0x6e, 0x00, 0xe2, 0x9f, 0x91, 0x51, 0xc9 } \
 }
@@ -5303,8 +5306,8 @@ struct IStorageController


 /* Start of struct IPerformanceMetric Declaration */
-#define IPERFORMANCEMETRIC_IID_STR "2a1a60ae-9345-4019-ad53-d34ba41cbfe9"
-#define IPERFORMANCEMETRIC_IID { \
+#  define IPERFORMANCEMETRIC_IID_STR "2a1a60ae-9345-4019-ad53-d34ba41cbfe9"
+#  define IPERFORMANCEMETRIC_IID { \
     0x2a1a60ae, 0x9345, 0x4019, \
     { 0xad, 0x53, 0xd3, 0x4b, 0xa4, 0x1c, 0xbf, 0xe9 } \
 }
@@ -5338,8 +5341,8 @@ struct IPerformanceMetric


 /* Start of struct IPerformanceCollector Declaration */
-#define IPERFORMANCECOLLECTOR_IID_STR "e22e1acb-ac4a-43bb-a31c-17321659b0c6"
-#define IPERFORMANCECOLLECTOR_IID { \
+#  define IPERFORMANCECOLLECTOR_IID_STR "e22e1acb-ac4a-43bb-a31c-17321659b0c6"
+#  define IPERFORMANCECOLLECTOR_IID { \
     0xe22e1acb, 0xac4a, 0x43bb, \
     { 0xa3, 0x1c, 0x17, 0x32, 0x16, 0x59, 0xb0, 0xc6 } \
 }
@@ -5425,8 +5428,8 @@ struct IPerformanceCollector


 /* Start of struct INATEngine Declaration */
-#define INATENGINE_IID_STR "4b286616-eb03-11de-b0fb-1701eca42246"
-#define INATENGINE_IID { \
+#  define INATENGINE_IID_STR "4b286616-eb03-11de-b0fb-1701eca42246"
+#  define INATENGINE_IID { \
     0x4b286616, 0xeb03, 0x11de, \
     { 0xb0, 0xfb, 0x17, 0x01, 0xec, 0xa4, 0x22, 0x46 } \
 }
@@ -5506,47 +5509,47 @@ struct INATEngine



-#define NS_VIRTUALBOX_CID { \
+#  define NS_VIRTUALBOX_CID { \
     0xB1A7A4F2, 0x47B9, 0x4A1E, \
     { 0x82, 0xB2, 0x07, 0xCC, 0xD5, 0x32, 0x3C, 0x3F } \
 }
-#define NS_VIRTUALBOX_CONTRACTID "@virtualbox.org/VirtualBox;1"
+#  define NS_VIRTUALBOX_CONTRACTID "@virtualbox.org/VirtualBox;1"
 /* for compatibility with Win32 */
-#define CLSID_VirtualBox (nsCID) NS_VIRTUALBOX_CID
+#  define CLSID_VirtualBox (nsCID) NS_VIRTUALBOX_CID



-#define NS_SESSION_CID { \
+#  define NS_SESSION_CID { \
     0x3C02F46D, 0xC9D2, 0x4F11, \
     { 0xA3, 0x84, 0x53, 0xF0, 0xCF, 0x91, 0x72, 0x14 } \
 }
-#define NS_SESSION_CONTRACTID "@virtualbox.org/Session;1"
+#  define NS_SESSION_CONTRACTID "@virtualbox.org/Session;1"
 /* for compatibility with Win32 */
-#define CLSID_Session (nsCID) NS_SESSION_CID
+#  define CLSID_Session (nsCID) NS_SESSION_CID



-#define NS_CALLBACKWRAPPER_CID { \
+#  define NS_CALLBACKWRAPPER_CID { \
     0x49EE8561, 0x5563, 0x4715, \
     { 0xB1, 0x8C, 0xA4, 0xB1, 0xA4, 0x90, 0xDA, 0xFE } \
 }
-#define NS_CALLBACKWRAPPER_CONTRACTID "@virtualbox.org/CallbackWrapper;1"
+#  define NS_CALLBACKWRAPPER_CONTRACTID "@virtualbox.org/CallbackWrapper;1"
 /* for compatibility with Win32 */
-#define CLSID_CallbackWrapper (nsCID) NS_CALLBACKWRAPPER_CID
+#  define CLSID_CallbackWrapper (nsCID) NS_CALLBACKWRAPPER_CID



-#endif /* !__cplusplus */
+# endif /* !__cplusplus */

-#ifdef IN_VBOXXPCOMC
-# define VBOXXPCOMC_DECL(type)  PR_EXPORT(type)
-#else
-# define VBOXXPCOMC_DECL(type)  PR_IMPORT(type)
-#endif
+# ifdef IN_VBOXXPCOMC
+#  define VBOXXPCOMC_DECL(type)  PR_EXPORT(type)
+# else
+#  define VBOXXPCOMC_DECL(type)  PR_IMPORT(type)
+# endif

-#ifdef __cplusplus
+# ifdef __cplusplus
 extern "C" {
-#endif
+# endif


 /**
@@ -5586,22 +5589,22 @@ typedef VBOXXPCOMC const *PCVBOXXPCOM;
 /** The current interface version.
  * For use with VBoxGetXPCOMCFunctions and to be found in
  * VBOXXPCOMC::uVersion. */
-#define VBOX_XPCOMC_VERSION     0x00020000U
+# define VBOX_XPCOMC_VERSION     0x00020000U

 VBOXXPCOMC_DECL(PCVBOXXPCOM) VBoxGetXPCOMCFunctions(unsigned uVersion);
 /** Typedef for VBoxGetXPCOMCFunctions. */
 typedef PCVBOXXPCOM (*PFNVBOXGETXPCOMCFUNCTIONS)(unsigned uVersion);

 /** The symbol name of VBoxGetXPCOMCFunctions. */
-#if defined(__OS2__)
-# define VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME   "_VBoxGetXPCOMCFunctions"
-#else
-# define VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME   "VBoxGetXPCOMCFunctions"
-#endif
+# if defined(__OS2__)
+#  define VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME   "_VBoxGetXPCOMCFunctions"
+# else
+#  define VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME   "VBoxGetXPCOMCFunctions"
+# endif


-#ifdef __cplusplus
+# ifdef __cplusplus
 }
-#endif
+# endif

 #endif /* !___VirtualBox_CXPCOM_h */
-- 
1.7.0.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]