Browse Source

minor extensions

FlorianPalm 11 years ago
parent
commit
5daa8e5478

+ 5 - 5
OPCUAServer/m4/ltversion.m4

@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3294 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3294])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3294'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])

+ 1 - 1
OPCUAServer/src/opcua_binaryEncDec.c

@@ -1123,7 +1123,7 @@ Int32 decodeVariant(char * const buf, Int32 *pos, UA_Variant *dstVariant)
 	{
 		decoder_decodeBuiltInDatatype(buf, INT32, pos,
 				&(dstVariant->ArrayLength));
-		dstVariant->Value->
+	//	dstVariant->Value->
 	}
 
 

+ 4 - 4
OPCUAServer/src/opcua_builtInDatatypes.h

@@ -107,7 +107,7 @@ typedef enum
 	VARIANT_MATRIX = 216,
 	DIAGNOSTIC_INFO_MATRIX = 217
 }
-UA_BuiltInDataTypes_Array;
+UA_BuiltInDataTypes_Matrix;
 
 
 
@@ -465,7 +465,7 @@ typedef struct
 	UInt32 *data;
 	Int32 arrayLength;
 	IntegerString  dimensions;
-}UInt32_Array
+}UInt32_Array;
 
 typedef struct
 {
@@ -574,14 +574,14 @@ typedef struct
 
 typedef struct
 {
-	UA_DataValue *data;
+	struct UA_DataValue *data;
 	Int32 arrayLength;
 	IntegerString  dimensions;
 }DataValue_Array;
 
 typedef struct
 {
-	UA_Variant *data;
+	struct UA_Variant *data;
 	Int32 arrayLength;
 	IntegerString  dimensions;
 }Variant_Array;