Changeset 36536 in vbox for trunk/include/VBox/com

Timestamp:

Apr 4, 2011 3:43:40 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70962

Message:

include/*: Made the headers build on linux again (kmk -C include).

Location:

trunk/include/VBox/com

Files:

• errorprint.h (modified) (1 diff)
• listeners.h (modified) (3 diffs)

trunk/include/VBox/com/errorprint.h

@@ -28 +28 @@
 #ifndef ___VBox_com_errorprint_h
 #define ___VBox_com_errorprint_h
+
+#include <VBox/com/ErrorInfo.h>
 
 namespace com

trunk/include/VBox/com/listeners.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * Listeners helpers.
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +27 @@
 #ifndef ___VBox_com_listeners_h
 #define ___VBox_com_listeners_h
+
 #include <VBox/com/com.h>
-#include <VBox/com/defs.h>
+#include <VBox/com/VirtualBox.h>
 
 #ifdef VBOX_WITH_XPCOM
-#define NS_IMPL_QUERY_HEAD_INLINE()                                   \
-NS_IMETHODIMP QueryInterface(REFNSIID aIID, void** aInstancePtr)      \
-{                                                                     \
-  NS_ASSERTION(aInstancePtr,                                          \
-               "QueryInterface requires a non-NULL destination!");    \
-  nsISupports* foundInterface;
-#define NS_INTERFACE_MAP_BEGIN_INLINE()      NS_IMPL_QUERY_HEAD_INLINE()
-#define NS_IMPL_QUERY_INTERFACE1_INLINE(_i1)                                 \
-  NS_INTERFACE_MAP_BEGIN_INLINE()                                            \
-    NS_INTERFACE_MAP_ENTRY(_i1)                                              \
-    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, _i1)                       \
-  NS_INTERFACE_MAP_END
+# define NS_IMPL_QUERY_HEAD_INLINE() \
+NS_IMETHODIMP QueryInterface(REFNSIID aIID, void **aInstancePtr) \
+{ \
+    NS_ASSERTION(aInstancePtr, "QueryInterface requires a non-NULL destination!"); \
+    nsISupports *foundInterface;
+
+# define NS_INTERFACE_MAP_BEGIN_INLINE()      NS_IMPL_QUERY_HEAD_INLINE()
+
+# define NS_IMPL_QUERY_INTERFACE1_INLINE(a_i1) \
+    NS_INTERFACE_MAP_BEGIN_INLINE() \
+        NS_INTERFACE_MAP_ENTRY(a_i1) \
+        NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, a_i1) \
+    NS_INTERFACE_MAP_END
 #endif
 
-template <class T, class TParam = void* >
+template <class T, class TParam = void *>
 class ListenerImpl :
      public CComObjectRootEx<CComMultiThreadModel>,
@@ -163 +164 @@
 
 #ifdef VBOX_WITH_XPCOM
-#define VBOX_LISTENER_DECLARE(klazz) NS_DECL_CLASSINFO(klazz)
+# define VBOX_LISTENER_DECLARE(klazz) NS_DECL_CLASSINFO(klazz)
 #else
-#define VBOX_LISTENER_DECLARE(klazz)
+# define VBOX_LISTENER_DECLARE(klazz)
 #endif