Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

1 files changed, 4 insertions, 4 deletions

diff --git a/include/siirtc.h b/include/siirtc.h
index 5864f95b8..de4fd634d 100644
--- a/include/siirtc.h
+++ b/include/siirtc.h
@@ -39,10 +39,10 @@ struct SiiRtcInfo
     u8 alarmMinute;
 };
 
-void SiiRtcUnprotect();
-void SiiRtcProtect();
-u8 SiiRtcProbe();
-bool8 SiiRtcReset();
+void SiiRtcUnprotect(void);
+void SiiRtcProtect(void);
+u8 SiiRtcProbe(void);
+bool8 SiiRtcReset(void);
 bool8 SiiRtcGetStatus(struct SiiRtcInfo *rtc);
 bool8 SiiRtcSetStatus(struct SiiRtcInfo *rtc);
 bool8 SiiRtcGetDateTime(struct SiiRtcInfo *rtc);