Browse Source

Function decl. in headers don't need "extern"

Scott Lahteine 9 years ago
parent
commit
4041508ffb
2 changed files with 10 additions and 10 deletions
  1. 5
    10
      Marlin/Marlin.h
  2. 5
    0
      Marlin/Marlin_main.cpp

+ 5
- 10
Marlin/Marlin.h View File

278
 extern bool axis_homed[3]; // axis[n].is_homed
278
 extern bool axis_homed[3]; // axis[n].is_homed
279
 
279
 
280
 // GCode support for external objects
280
 // GCode support for external objects
281
-extern bool code_seen(char);
282
-extern float code_value();
283
-extern long code_value_long();
284
-extern int16_t code_value_short();
281
+bool code_seen(char);
282
+float code_value();
283
+long code_value_long();
284
+int16_t code_value_short();
285
 
285
 
286
 #if ENABLED(DELTA)
286
 #if ENABLED(DELTA)
287
   extern float delta[3];
287
   extern float delta[3];
355
 // Handling multiple extruders pins
355
 // Handling multiple extruders pins
356
 extern uint8_t active_extruder;
356
 extern uint8_t active_extruder;
357
 
357
 
358
-#if ENABLED(DIGIPOT_I2C)
359
-  extern void digipot_i2c_set_current(int channel, float current);
360
-  extern void digipot_i2c_init();
361
-#endif
362
-
363
 #if HAS_TEMP_HOTEND || HAS_TEMP_BED
358
 #if HAS_TEMP_HOTEND || HAS_TEMP_BED
364
   void print_heaterstates();
359
   void print_heaterstates();
365
 #endif
360
 #endif
366
 
361
 
367
-extern void calculate_volumetric_multipliers();
362
+void calculate_volumetric_multipliers();
368
 
363
 
369
 #endif //MARLIN_H
364
 #endif //MARLIN_H

+ 5
- 0
Marlin/Marlin_main.cpp View File

576
 }
576
 }
577
 #endif //!SDSUPPORT
577
 #endif //!SDSUPPORT
578
 
578
 
579
+#if ENABLED(DIGIPOT_I2C)
580
+  extern void digipot_i2c_set_current(int channel, float current);
581
+  extern void digipot_i2c_init();
582
+#endif
583
+
579
 /**
584
 /**
580
  * Inject the next "immediate" command, when possible.
585
  * Inject the next "immediate" command, when possible.
581
  * Return true if any immediate commands remain to inject.
586
  * Return true if any immediate commands remain to inject.

Loading…
Cancel
Save