yet additional changes towards supporting windows compilation

Change-Id: I79856b0b80d660cbef15d6443754c3e2ad84c5b6
Signed-off-by: Avner BenHanoch <avnerb@mellanox.com>