Moved __INIT_* defines within type definition headers files
authorEdouard Tisserant
Thu, 16 May 2013 14:37:33 +0900
changeset 818 2a3f34967cae
parent 817 6a67fbc7bea7
child 819 5aef7d20b0fc
Moved __INIT_* defines within type definition headers files
lib/iec_std_lib.h
lib/iec_types.h
--- a/lib/iec_std_lib.h	Thu May 02 10:42:17 2013 +0200
+++ b/lib/iec_std_lib.h	Thu May 16 14:37:33 2013 +0900
@@ -111,29 +111,6 @@
 #define __LWORD_LITERAL(value) __literal(LWORD,value,__64b_sufix)
 
 
-
-#define __INIT_REAL 0
-#define __INIT_LREAL 0
-#define __INIT_SINT 0
-#define __INIT_INT 0
-#define __INIT_DINT 0
-#define __INIT_LINT 0
-#define __INIT_USINT 0
-#define __INIT_UINT 0
-#define __INIT_UDINT 0
-#define __INIT_ULINT 0
-#define __INIT_TIME (TIME){0,0}
-#define __INIT_BOOL 0
-#define __INIT_BYTE 0
-#define __INIT_WORD 0
-#define __INIT_DWORD 0
-#define __INIT_LWORD 0
-#define __INIT_STRING (STRING){0,""}
-//#define __INIT_WSTRING
-#define __INIT_DATE (DATE){0,0}
-#define __INIT_TOD (TOD){0,0}
-#define __INIT_DT (DT){0,0}
-
 typedef union __IL_DEFVAR_T {
     BOOL    BOOLvar;
 
--- a/lib/iec_types.h	Thu May 02 10:42:17 2013 +0200
+++ b/lib/iec_types.h	Thu May 16 14:37:33 2013 +0900
@@ -47,6 +47,28 @@
 #define STR_LEN_TYPE int8_t
 #endif
 
+#define __INIT_REAL 0
+#define __INIT_LREAL 0
+#define __INIT_SINT 0
+#define __INIT_INT 0
+#define __INIT_DINT 0
+#define __INIT_LINT 0
+#define __INIT_USINT 0
+#define __INIT_UINT 0
+#define __INIT_UDINT 0
+#define __INIT_ULINT 0
+#define __INIT_TIME (TIME){0,0}
+#define __INIT_BOOL 0
+#define __INIT_BYTE 0
+#define __INIT_WORD 0
+#define __INIT_DWORD 0
+#define __INIT_LWORD 0
+#define __INIT_STRING (STRING){0,""}
+//#define __INIT_WSTRING
+#define __INIT_DATE (DATE){0,0}
+#define __INIT_TOD (TOD){0,0}
+#define __INIT_DT (DT){0,0}
+
 typedef STR_LEN_TYPE __strlen_t;
 typedef struct {
     __strlen_t len;