DataInfo struct defined in both nmps.h and nmps_plc_macro.h

nmps/lib/nmps/src/nmps.h

 /* 
- * Proview   $Id: nmps.h,v 1.1 2006-01-12 05:57:43 claes Exp $
+ * Proview   $Id: nmps.h,v 1.2 2006-04-27 13:12:53 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -53,6 +53,8 @@
 #define NMPS_TRPFUNC_SLOW               16
 #define NMPS_TRPFUNC_LEVEL              32
  
+#ifndef nmps_data_info
+#define nmps_data_info
 /* Data structure for one dataobjekt in a NMpsCell and NMpsSelectCell */
 typedef struct {
 	pwr_tFloat32	*DataP;
@@ -64,18 +66,19 @@ typedef struct {
 	pwr_tBoolean	Data_OldSelect;
 	} plc_t_DataInfo;
 
-/* Data structure for the DLpointer and the objid in a Cell */
+/* Data structure for one dataobjekt in a NMpsMirrorCell */
 typedef struct {
 	pwr_tFloat32	*DataP;
 	pwr_tObjid	Data_ObjId;
-	} plc_t_DataInfoBrief;
+	gdh_tDlid	Data_Dlid;	
+	} plc_t_DataInfoMirCell;
+#endif
 
-/* Data structure for one dataobjekt in a NMpsMirrorCell */
+/* Data structure for the DLpointer and the objid in a Cell */
 typedef struct {
 	pwr_tFloat32	*DataP;
 	pwr_tObjid	Data_ObjId;
-	gdh_tDlid	Data_Dlid;	
-	} plc_t_DataInfoMirCell;
+	} plc_t_DataInfoBrief;
 
 /* Data structure for the copyarea in a  NMpsMirrorCell */
 typedef struct {

nmps/lib/nmps/src/nmps_plc_macro.h

 /* 
- * Proview   $Id: nmps_plc_macro.h,v 1.2 2006-01-26 08:15:12 claes Exp $
+ * Proview   $Id: nmps_plc_macro.h,v 1.3 2006-04-27 13:12:53 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -25,6 +25,9 @@
 # include <float.h>
 #endif
 
+#ifndef nmps_data_info
+#define nmps_data_info
+
 typedef struct {
 	char		Key[40];
 	pwr_tStatus	Status;
@@ -32,11 +35,11 @@ typedef struct {
 	} nmps_sTrans;
 
 typedef struct {
-	pwr_tUInt32	*DataP;
+	pwr_tFloat32	*DataP;
 	pwr_tObjid	Data_ObjId;
 	pwr_tBoolean	Data_Front;
 	pwr_tBoolean	Data_Back;
-	pwr_tRefId	Data_Dlid;
+	pwr_tDlid	Data_Dlid;
 	pwr_tBoolean	Data_Select;
 	pwr_tBoolean	Data_OldSelect;
 	} plc_t_DataInfo;
@@ -46,6 +49,7 @@ typedef struct {
 	pwr_tObjid	Data_ObjId;
 	pwr_tRefId	Data_Dlid;
 	} plc_t_DataInfoMirCell;
+#endif
 
 /*_*
   DataCopy