Changeset 53697 in vbox for trunk

Timestamp:

Jan 2, 2015 12:42:29 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: #undef string function before re-#defining them. (r74)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -406 +406 @@
 # include <iprt/string.h>
 # include <iprt/time.h>
+# include <stdlib.h>
+# include <string.h>
+
+# undef gethrtime
 # define gethrtime()                RTTimeNanoTS()
+# undef strcasecmp
 # define strcasecmp(a_psz1, a_psz2) RTStrICmp(a_psz1, a_psz2)
+# undef strncasecmp
 # define strncasecmp(a_psz1, a_psz2, a_cch) \
-                                    RTStrNICmp(a_psz1, a_psz2, a_cch)
 # undef assert
 # define assert(expr)               Assert(expr)
@@ -415 +420 @@
 /* This isn't necessarily making things easier at first, but allows EF and
    such later on when things doesn't work right. */
-# include <stdlib.h>
-# include <string.h>
+# undef malloc
 # define malloc(a_cbMem)            RTMemAlloc(a_cbMem)
+# undef realloc
 # define realloc(a_pvOld, a_cbMem)  RTMemRealloc(a_pvOld, a_cbMem)
+# undef calloc
 # define calloc(a_cbItem, a_cItems) RTMemAllocZ((size_t)(a_cbItem) * (a_cItems))
+# undef free
 # define free(a_pvMem)              RTMemFree(a_pvMem)
+# undef strdup
 # define strdup(a_psz)              RTStrDup(a_psz)
+# undef strndup
 # define strndup(a_psz, a_cchMax)   RTStrDupN(a_psz, a_cchMax)
+# undef strlcpy
 # define strlcpy(a_pszDst, a_pszSrc, a_cbDst) ((void)RTStrCopy(a_pszDst, a_cbDst, a_pszSrc))