X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/a4ebf4e92061bf1eec9224e64bc823ca7bedada4..e11fddfe66fcd6fa5b783bb5f1c39dfb5687538d:/LUFA/Drivers/Board/USBKEY/Joystick.h?ds=inline

diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h
index bbb2a1663..b6dd8d17d 100644
--- a/LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/USBKEY/Joystick.h
@@ -61,7 +61,7 @@
 		#endif
 
 	/* Preprocessor Checks: */
-		#if !defined(INCLUDE_FROM_JOYSTICK_H)
+		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
 			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
 		#endif
 
@@ -100,8 +100,8 @@
 				PORTE |= JOY_EMASK;				
 			}
 			
-			static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Joystick_GetStatus(void)
+			static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uintN_t Joystick_GetStatus(void)
 			{
 				return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1));
 			}