fixed conflicts with Cortex headers
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 5 Sep 2014 12:54:19 +0000 (15:54 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 5 Sep 2014 12:54:19 +0000 (15:54 +0300)
commit735bac5c126a5687835251dac46371ab307182f1
treed8899dc3a37f237e4f1943f077961b7e1cbc598e
parent76fcb9959ce206f78f7e2043cd178924f07c4052
fixed conflicts with Cortex headers
include/nms_common.h
include/nms_util.h
src/libnetxms/main.cpp