Fix compiler redefined warnings for FMT_IU

common/eda_text.cpp

@@ -38,9 +38,13 @@
 
 // Conversion to application internal units defined at build time.
 #if defined( PCBNEW )
-    #include <class_board_item.h>       // for FMT_IU
+    #include <class_board_item.h>
+    #define FMT_IU     BOARD_ITEM::FormatInternalUnits
+    #define FMT_ANGLE  BOARD_ITEM::FormatAngle
 #elif defined( EESCHEMA )
-    #include <sch_item_struct.h>        // for FMT_IU
+    #include <sch_item_struct.h>
+    #define FMT_IU          SCH_ITEM::FormatInternalUnits
+    #define FMT_ANGLE       SCH_ITEM::FormatAngle
 #elif defined( GERBVIEW )
 #elif defined( PL_EDITOR )
     #include <base_units.h>

eeschema/sch_item_struct.h

@@ -51,8 +51,6 @@ typedef SCH_ITEMS::iterator SCH_ITEMS_ITR;
 typedef std::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
 
 
-#define FMT_IU          SCH_ITEM::FormatInternalUnits
-#define FMT_ANGLE       SCH_ITEM::FormatAngle
 
 
 /**

include/class_board_item.h

@@ -35,9 +35,6 @@
 #include <gr_basic.h>
 #include <layers_id_colors_and_visibility.h>
 
-/// Abbrevation for fomatting internal units to a string.
-#define FMT_IU     BOARD_ITEM::FormatInternalUnits
-#define FMT_ANGLE  BOARD_ITEM::FormatAngle
 
 class BOARD;
 class BOARD_ITEM_CONTAINER;

pcbnew/class_netclass.cpp

@@ -33,6 +33,10 @@
 #include <class_board.h>
 #include <class_netclass.h>
 
+/// Abbrevation for fomatting internal units to a string.
+#define FMT_IU     BOARD_ITEM::FormatInternalUnits
+#define FMT_ANGLE  BOARD_ITEM::FormatAngle
+
 
 // This will get mapped to "kicad_default" in the specctra_export.
 const char NETCLASS::Default[] = "Default";