Changeset 11559 in vbox

Timestamp:

Aug 21, 2008 10:16:32 PM (17 years ago)

Author:

vboxsync

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

35144

Message:

vslick.h fixes.

File:

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

trunk/Makefile.kmk

@@ -484 +484 @@
         echo '#define NS_IMETHOD_(type) type ' >> [email protected]
         echo '#define PARSERS_EXPORT ' >> [email protected]
-        echo '#define SAX_EXPORT ' >> [email protected]
         echo '#define STDMETHOD(a) NS_IMETHOD a ' >> [email protected]
-        echo '#define XERCES_CPP_NAMESPACE_BEGIN ' >> [email protected]
-        echo '#define XERCES_CPP_NAMESPACE_END ' >> [email protected]
 
         echo '#define CTXAllSUFF(var)                 var##R3 ' >> [email protected]
@@ -496 +493 @@
         echo '#define OTHERCTXMID(first, last)        first##GC##last ' >> [email protected]
         echo '#define CTXTYPE(GCType, R3Type, R0Type) R3Type ' >> [email protected]
+        echo '#define RCTYPE(RCType, HCType)          RCType ' >> [email protected]
+        echo '#define GCTYPE(GCType, HCType)          GCType ' >> [email protected]
+        echo '#define RCPTRTYPE(RCType)               RCType ' >> [email protected]
         echo '#define GCPTRTYPE(GCType)               GCType ' >> [email protected]
-        echo '#define GCTYPE(GCType, HCType)          GCType ' >> [email protected]
         echo '#define HCPTRTYPE(HCType)               HCType ' >> [email protected]
         echo '#define R3R0PTRTYPE(HCType)             HCType ' >> [email protected]
@@ -508 +507 @@
         echo '#define DECLINLINE(type)                inline type ' >> [email protected]
 
-        echo '#define PDM_SRC_POS                     __FILE__, __LINE__, __PRETTY_FUNCTION__ ' >> [email protected]
-        echo '#define PDM_SRC_POS_DECL                const char *pszFile, unsigned iLine, const char *pszFunction ' >> [email protected]
-        echo '#define PDM_SRC_POS_ARGS                pszFile, iLine, pszFunction ' >> [email protected]
         echo '#define PDMDEVINSINT_DECLARED           1' >> [email protected]
         echo '#define VBOXCALL' >> [email protected]
@@ -538 +534 @@
         $(MV) -f [email protected] $@
         $(RM) -f [email protected] [email protected] [email protected]
+ifeq ($(KBUILD_HOST),win)
+        $(ECHO) 'TODO: Merge vslick.h with your "$(HOMEDRIVE)$(HOMEPATH)\Documents\My SlickEdit Config\x.y.z\usercpp.h" file.'
+else
         $(ECHO) "TODO: Merge ./vslick.h with your ~/.slickedit/x.y.z/unxcpp.h file."
+endif