resource: Fix build break on randomtest
authorDan Mihai <Daniel.Mihai@microsoft.com>
Wed, 14 Dec 2016 16:17:08 +0000 (08:17 -0800)
committerPhil Coval <philippe.coval@osg.samsung.com>
Wed, 14 Dec 2016 18:31:19 +0000 (18:31 +0000)
commit8bcd80d8a5c7bea1f6b0954891d3b37c200b633d
treefc75aa7ca8a061d047d4cb9ed2cb3467fc068562
parente7f5a0070c3aa625fe507f74d798fb0a78c15b17
resource: Fix build break on randomtest

Fix conflict between commits 80a131603151b1666c092ac03e76af399b500b9d
and 4333f4c5cc1578449afbc04dce1bd890f7017cfa.

Change-Id: I29b343b92b27fd819bac0275bfbc4ae1b931cb23
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15619/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15619
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
resource/c_common/ocrandom/test/randomtest.cpp