Skip to Content.
Sympa Menu

ndt-dev - [ndt-dev] [ndt] r1214 committed - Merge branch Issue167 into trunk

Subject: NDT-DEV email list created

List archive

[ndt-dev] [ndt] r1214 committed - Merge branch Issue167 into trunk


Chronological Thread 
  • From:
  • To:
  • Subject: [ndt-dev] [ndt] r1214 committed - Merge branch Issue167 into trunk
  • Date: Fri, 20 Mar 2015 12:10:34 +0000

Revision: 1214
Author:

Date: Fri Mar 20 12:10:22 2015 UTC
Log: Merge branch Issue167 into trunk

https://code.google.com/p/ndt/source/detail?r=1214

Modified:
/trunk
/trunk/HTML5-frontend/script.js
/trunk/src/web100-util.c

=======================================
--- /trunk/HTML5-frontend/script.js Fri Mar 20 08:34:38 2015 UTC
+++ /trunk/HTML5-frontend/script.js Fri Mar 20 12:10:22 2015 UTC
@@ -426,8 +426,6 @@
var a = testNDT();
var d = '';

-d += "error: " + testError();
-
d += "Your system: " + a.getNDTvar("OperatingSystem").bold() + "<br>";
d += "Plugin version: " + (a.getNDTvar("PluginVersion") + " (" + a.getNDTvar("OsArchitecture") + ")<br>").bold();

=======================================
--- /trunk/src/web100-util.c Wed Jun 4 10:51:11 2014 UTC
+++ /trunk/src/web100-util.c Fri Mar 20 12:10:22 2015 UTC
@@ -134,7 +134,11 @@

return (count_vars);
#elif USE_WEB10G
- return TOTAL_INDEX_MAX;
+ #ifdef ESTATS_MIB_VAR_H
+ return TOTAL_NUM_VARS;
+ #else
+ return TOTAL_INDEX_MAX;
+ #endif
#endif
}



  • [ndt-dev] [ndt] r1214 committed - Merge branch Issue167 into trunk, ndt, 03/20/2015

Archive powered by MHonArc 2.6.16.

Top of Page