Merge "Replace all uses of bzero with memset. Bzero and memset are both compiler built-ins so this change should not negatively effect the generated code. However, a forthcoming commit will remove the implicit include of strings.h from stdlib.h and bzero will no longer be visible in these translation units without additional includes."
diff --git a/tests/BrowserTestPlugin/jni/main.cpp b/tests/BrowserTestPlugin/jni/main.cpp
index 87ddbc4..402a7e2 100644
--- a/tests/BrowserTestPlugin/jni/main.cpp
+++ b/tests/BrowserTestPlugin/jni/main.cpp
@@ -142,7 +142,7 @@
if (browser->version >= 14) {
instance->pdata = browser->createobject (instance, getPluginClass());
obj = static_cast<PluginObject*>(instance->pdata);
- bzero(obj, sizeof(*obj));
+ memset(obj, 0, sizeof(*obj));
} else {
return NPERR_GENERIC_ERROR;
}