Interrupts: remove C prototype and keep only C++ prototypes

ABOSTM · ABOSTM · commit c78cb1b4dd10 · 2022-01-07T08:33:11.000+01:00
attachInterrupt() C prototypes was not usable from C source file (inheritance of former pure C implementation), and causes ambiguity when used with lambda function as callback Fixes #1601 Signed-off-by: Alexandre Bourdiol <alexandre.bourdiol@st.com>
diff --git a/cores/arduino/WInterrupts.h b/cores/arduino/WInterrupts.h
@@ -20,17 +20,10 @@
 #define _WIRING_INTERRUPTS_
 
 #include <stdint.h>
+#include <functional>
 
-#ifdef __cplusplus
-  #include <functional>
-
-  typedef std::function<void(void)> callback_function_t;
-  void attachInterrupt(uint32_t pin, callback_function_t callback, uint32_t mode);
-
-#endif
-
-void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode);
-
+typedef std::function<void(void)> callback_function_t;
+void attachInterrupt(uint32_t pin, callback_function_t callback, uint32_t mode);
 void detachInterrupt(uint32_t pin);
 
 #endif /* _WIRING_INTERRUPTS_ */
diff --git a/cores/arduino/wiring.h b/cores/arduino/wiring.h
@@ -36,16 +36,16 @@
 #include "wiring_pulse.h"
 #include "wiring_shift.h"
 #include "wiring_time.h"
-#include "WInterrupts.h"
 
 #include <board.h>
 
 #ifdef __cplusplus
   #include "HardwareTimer.h"
   #include "Tone.h"
   #include "WCharacter.h"
-  #include "WSerial.h"
+  #include "WInterrupts.h"
   #include "WMath.h"
+  #include "WSerial.h"
   #include "WString.h"
 #endif // __cplusplus
 
