Changeset 53998 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Jan 28, 2015 12:13:07 AM (10 years ago)

Author:

vboxsync

Message:

bzero/bcopy fixes.

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace/include

Files:

• VBoxDTraceLibCWrappers.h (modified) (1 diff)
• VBoxDTraceTypes.h (modified) (1 diff)

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

@@ -85 +85 @@
 #define strndup(a_psz, a_cchMax)    ((char *)RTMemDupEx(a_psz, RTStrNLen(a_psz, a_cchMax), 1))
 
+/* For various stupid reasons, these are duplicated in VBoxDTraceTypes.h. */
+#undef bcopy
+#define bcopy(a_pSrc, a_pDst, a_cb) ((void)memmove(a_pDst, a_pSrc, a_cb))
+#undef bzero
+#define bzero(a_pDst, a_cb)         ((void)memset(a_pDst, 0, a_cb))
+#undef bcmp
+#define bcmp(a_p1, a_p2, a_cb)      (memcmp(a_p1, a_p2, a_cb))
+
 #endif
 

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

@@ -134 +134 @@
  * string
  */
+#undef bcopy
+#define bcopy(a_pSrc, a_pDst, a_cb) ((void)memmove(a_pDst, a_pSrc, a_cb))
+#undef bzero
+#define bzero(a_pDst, a_cb)         ((void)memset(a_pDst, 0, a_cb))
+#undef bcmp
+#define bcmp(a_p1, a_p2, a_cb)      (memcmp(a_p1, a_p2, a_cb))
 #if defined(_MSC_VER) || defined(IN_RING0)
-# define bcopy(a_pSrc, a_pDst, a_cb) memmove(a_pDst, a_pSrc, a_cb)
-# define bzero(a_pDst, a_cb)        RT_BZERO(a_pDst, a_cb)
-# define bcmp(a_p1, a_p2, a_cb)     memcmp(a_p1, a_p2, a_cb)
 # define snprintf                   RTStrPrintf
 # define vsnprintf                  RTStrPrintfV