[fix] Broken build from version 1.5.3 to 1.5.5

Author: robertsLando

package-lock.json

@@ -157,7 +157,7 @@ namespace OZW {
 		);
 	}
 
-#ifdef OPENZWAVE_16
+#if OPENZWAVE_16
 	/*
 	 *
 	 */

src/openzwave-groups.cc

@@ -93,7 +93,7 @@ namespace OZW {
 		OZWManager( SwitchAllOff, homeid);
 	}
 #endif
-#ifdef OPENZWAVE_16
+#if OPENZWAVE_16
 	// ===================================================================
 	NAN_METHOD(OZW::SendRawData)
 	// ===================================================================

src/openzwave-nodes.cc

@@ -81,7 +81,7 @@ namespace OZW {
 		Nan::SetPrototypeMethod(t, "getGroupLabel", OZW::GetGroupLabel);
 		Nan::SetPrototypeMethod(t, "addAssociation", OZW::AddAssociation);
 		Nan::SetPrototypeMethod(t, "removeAssociation", OZW::RemoveAssociation);
-#ifdef OPENZWAVE_16
+#if OPENZWAVE_16
 		Nan::SetPrototypeMethod(t, "isMultiInstance", OZW::IsMultiInstance);
 #endif
 
@@ -125,7 +125,7 @@ namespace OZW {
 		Nan::SetPrototypeMethod(t, "switchAllOn", OZW::SwitchAllOn);
 		Nan::SetPrototypeMethod(t, "switchAllOff", OZW::SwitchAllOff);
 #endif
-#ifdef OPENZWAVE_16
+#if OPENZWAVE_16
 		Nan::SetPrototypeMethod(t, "sendRawData", OZW::SendRawData);
 #endif
 		Nan::SetPrototypeMethod(t, "pressButton", OZW::PressButton);

src/openzwave.cc

@@ -77,7 +77,7 @@ namespace OZW {
 		static NAN_METHOD(GetGroupLabel);
 		static NAN_METHOD(AddAssociation);
 		static NAN_METHOD(RemoveAssociation);
-#ifdef OPENZWAVE_16
+#if OPENZWAVE_16
     static NAN_METHOD(IsMultiInstance);
 #endif
 #if OPENZWAVE_SECURITY == 1
@@ -119,7 +119,7 @@ namespace OZW {
 		static NAN_METHOD(SwitchAllOn);
 		static NAN_METHOD(SwitchAllOff);
 #endif
-#ifdef OPENZWAVE_16
+#if OPENZWAVE_16
 		static NAN_METHOD(SendRawData);
 #endif
 		static NAN_METHOD(PressButton);

src/openzwave.hpp

@@ -275,8 +275,8 @@ namespace OZW {
 		AddStringProp (nodeobj, type,      value.GetTypeAsString());
 		AddStringProp (nodeobj, genre,     value.GetGenreAsString());
 #elif OPENZWAVE_VALUETYPE_FROM_ENUM
-		AddStringProp (nodeobj, type,      OpenZWave::Internal::VC::ValueList::GetTypeNameFromEnum(value.GetType()));
-		AddStringProp (nodeobj, genre,     OpenZWave::Internal::VC::ValueList::GetGenreNameFromEnum(value.GetGenre()));
+		AddStringProp (nodeobj, type,      OpenZWave::Value::GetTypeNameFromEnum(value.GetType()));
+		AddStringProp (nodeobj, genre,     OpenZWave::Value::GetGenreNameFromEnum(value.GetGenre()));
 #else
 		AddIntegerProp(nodeobj, type,      value.GetType());
 		AddIntegerProp(nodeobj, genre,     value.GetGenre());