Changeset 28299 in vbox

Timestamp:

Apr 14, 2010 12:21:46 PM (15 years ago)

Author:

vboxsync

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

60051

Message:

Makefile.kmk: Added RT_NO_THROW and RT_THROW to vslick.h, fixed typo and improved the sorting (for diffing).

File:

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

trunk/Makefile.kmk

@@ -1120 +1120 @@
         @$(APPEND) $@.tmp '#define RT_C_DECLS_BEGIN '
         @$(APPEND) $@.tmp '#define RT_C_DECLS_END '
+        @$(APPEND) $@.tmp '#define RT_NO_THROW '
+        @$(APPEND) $@.tmp '#define RT_THROW(type) throw(type)'
 
         @$(APPEND) $@.tmp '#define ATL_NO_VTABLE '
@@ -1183 +1185 @@
         @$(APPEND) $@.tmp '#define RTCALL'
         @$(APPEND) $@.tmp '#define DECLINLINE(type)                inline type '
-        @$(APPEND) $@.tmp '#define DECL_FORCED_INLINE(type)        inline type '
+        @$(APPEND) $@.tmp '#define DECL_FORCE_INLINE(type)         inline type '
         @$(APPEND) $@.tmp '#define DECL_INVALID(type)              type '
 
@@ -1207 +1209 @@
                 -e '/define  *DECL..CALLBACKMEMBER(type[^)]*) *RT/d' \
                 -e '/define  *DECLINLINE(type)/d' \
+                -e '/define  *DECL_FORCE_INLINE(type)/d' \
                 -e '/  *DECL_INVALID(/d' \
                 -e '/define RT[DATGRC03]*DECL(type) *DECLHIDDEN(type)/d' \
@@ -1213 +1216 @@
                 $(filter-out include/VBox/err.h, $(wildcard include/VBox/*.h)) \
                 include/iprt/cdefs.h
-        $(CAT_EXT) $@.tmp | sort | $(SED_EXT) -e 's/$$/\n/' --output $@.tmp2
+        $(CAT_EXT) $@.tmp \
+                | $(SED_EXT) -e 's/_/\x1F/g' -e 's/(/\x1E/g' -e 's/[[:space:]][[:space:]]*/\x1C/g' \
+                | sort $(if-expr "$(KBUILD_TARGET)" == "win",,-f) \
+                | $(SED_EXT) -e 's/\x1F/_/g' -e 's/\x1E/(/g' -e 's/\x1C/ /g' \
+                | $(SED_EXT) -e 's/$$/\n/' --output $@.tmp2
         $(MV) -f $@.tmp2 $@
         $(RM) -f $@.tmp $@.tmp2 $@.tmp3