Changeset 24300 in vbox

Timestamp:

Nov 3, 2009 7:22:34 PM (15 years ago)

Author:

vboxsync

Message:

/Makefile.kmk: added some essential macro definitions that was missing from the vslick.h header (SlickEdit).

File:

• trunk/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -907 +907 @@
         @$(APPEND) $@.tmp '#define DEFINE_EMPTY_CTOR_DTOR(a)       a::a() {}   a::~a() {}'
         @$(APPEND) $@.tmp '#define NS_DECL_ISUPPORTS '
-        @$(APPEND) $@.tmp '#define NS_IMETHOD                      NS_IMETHOD_(nsresult) '
-        @$(APPEND) $@.tmp '#define NS_IMETHOD_(type)               type '
+        @$(APPEND) $@.tmp '#define NS_IMETHOD                      virtual nsresult '
+        @$(APPEND) $@.tmp '#define NS_IMETHOD_(type)               virtual type '
+        @$(APPEND) $@.tmp '#define NS_IMETHODIMP                   nsresult '
+        @$(APPEND) $@.tmp '#define NS_IMETHODIMP_(type)            type '
         @$(APPEND) $@.tmp '#define PARSERS_EXPORT '
-        @$(APPEND) $@.tmp '#define STDMETHOD(a)                    NS_IMETHOD a '
+if1of ($(KBUILD_HOST),win)
+        @$(APPEND) $@.tmp '#define STDMETHOD(m)                    virtual HRESULT m '
+        @$(APPEND) $@.tmp '#define STDMETHOD_(type,m)              virtual type m '
+        @$(APPEND) $@.tmp '#define STDMETHODIMP                    HRESULT '
+        @$(APPEND) $@.tmp '#define STDMETHODIMP_(type)             type '
+else
+        @$(APPEND) $@.tmp '#define STDMETHOD(m)                    virtual nsresult m '
+        @$(APPEND) $@.tmp '#define STDMETHOD_(type,m)              virtual type m '
+        @$(APPEND) $@.tmp '#define STDMETHODIMP                    nsresult '
+        @$(APPEND) $@.tmp '#define STDMETHODIMP_(type)             type '
+endif
         @$(APPEND) $@.tmp '#define VBOX_SCRIPTABLE(a)              public a '
         @$(APPEND) $@.tmp '#define VBOX_SCRIPTABLE_IMPL(a) '