Changeset 22522 in vbox

Timestamp:

Aug 27, 2009 1:22:41 PM (16 years ago)

Author:

vboxsync

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

51544

Message:

slickedit adj for main code.

File:

• trunk/Makefile.kmk (modified) (2 diffs)

trunk/Makefile.kmk

@@ -838 +838 @@
         @$(APPEND) [email protected] '#define ATL_NO_VTABLE '
         @$(APPEND) [email protected] '#define BEGIN_COM_MAP(a) '
+        @$(APPEND) [email protected] '#define COM_INTERFACE_ENTRY(a) '
+        @$(APPEND) [email protected] '#define COM_INTERFACE_ENTRY2(a,b) '
+        @$(APPEND) [email protected] '#define COM_INTERFACE_ENTRY3(a,b,c) '
+        @$(APPEND) [email protected] '#define COM_INTERFACE_ENTRY4(a,b,c,d) '
         @$(APPEND) [email protected] '#define END_COM_MAP(a) '
 
-        @$(APPEND) [email protected] '#define CHECKREADY if(!isReady()) return E_UNEXPECTED; '
         @$(APPEND) [email protected] '#define COM_DECL_READONLY_ENUM_AND_COLLECTION(a) '
-        @$(APPEND) [email protected] '#define COM_INTERFACE_ENTRY(a) '
         @$(APPEND) [email protected] '#define COMGETTER(n)                    Get##n '
         @$(APPEND) [email protected] '#define COMSETTER(n)                    Set##n '
         @$(APPEND) [email protected] '#define ComSafeArrayIn(t,a)             t a[] '
         @$(APPEND) [email protected] '#define ComSafeArrayOut(t,a)            t * a[] '
+        @$(APPEND) [email protected] '#define DECLARE_CLASSFACTORY(a) '
+        @$(APPEND) [email protected] '#define DECLARE_CLASSFACTORY_SINGLETON(a) '
+        @$(APPEND) [email protected] '#define DECLARE_REGISTRY_RESOURCEID(a) '
         @$(APPEND) [email protected] '#define DECLARE_NOT_AGGREGATABLE(a) '
         @$(APPEND) [email protected] '#define DECLARE_PROTECT_FINAL_CONSTRUCT(a) '
+        @$(APPEND) [email protected] '#define DECLARE_EMPTY_CTOR_DTOR(a)      a(); ~a();'
+        @$(APPEND) [email protected] '#define DEFINE_EMPTY_CTOR_DTOR(a)       a::a() {}   a::~a() {}'
         @$(APPEND) [email protected] '#define NS_DECL_ISUPPORTS '
-        @$(APPEND) [email protected] '#define NS_IMETHOD NS_IMETHOD_(nsresult) '
-        @$(APPEND) [email protected] '#define NS_IMETHOD_(type) type '
+        @$(APPEND) [email protected] '#define NS_IMETHOD                      NS_IMETHOD_(nsresult) '
+        @$(APPEND) [email protected] '#define NS_IMETHOD_(type)               type '
         @$(APPEND) [email protected] '#define PARSERS_EXPORT '
-        @$(APPEND) [email protected] '#define STDMETHOD(a) NS_IMETHOD a '
+        @$(APPEND) [email protected] '#define STDMETHOD(a)                    NS_IMETHOD a '
+        @$(APPEND) [email protected] '#define VBOX_SCRIPTABLE(a)              public a '
+        @$(APPEND) [email protected] '#define VBOX_SCRIPTABLE_IMPL(a) '
+        @$(APPEND) [email protected] '#define VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(a) '
 
         @$(APPEND) [email protected] '#define CTX_SUFF(var)                   var##R3 '
         @$(APPEND) [email protected] '#define CTXAllSUFF(var)                 var##R3 '
         @$(APPEND) [email protected] '#define CTXSUFF(var)                    var##HC '
-        @$(APPEND) [email protected] '#define OTHERCTXSUFF(var)          var##GC '
+        @$(APPEND) [email protected] '#define OTHERCTXSUFF(var)               var##GC '
         @$(APPEND) [email protected] '#define CTXALLMID(first, last)          first##R3##last '
         @$(APPEND) [email protected] '#define CTXMID(first, last)             first##HC##last '
@@ -876 +886 @@
         @$(APPEND) [email protected] '#define RTCALL'
         @$(APPEND) [email protected] '#define DECLINLINE(type)                inline type '
+        @$(APPEND) [email protected] '#define DECL_FORCED_INLINE(type)        inline type '
 
         @$(APPEND) [email protected] '#define PDMDEVINSINT_DECLARED           1'
+        @$(APPEND) [email protected] '#define VBOX_WITH_HGCM                  1'
         @$(APPEND) [email protected] '#define VBOXCALL'