X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/995195a2b06142fb0882cf116a12bdab8e19603f..b1625400998819846288e02a780b2b5ab14da143:/LUFA/Common/Common.h

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 6a9356bbb..02fc98fdc 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -67,13 +67,25 @@
 		#include <string.h>
 		#include <stddef.h>
 		
+		#if defined(USE_LUFA_CONFIG_HEADER)
+			#include "LUFAConfig.h"
+		#endif
+
 		#include "Architectures.h"
 		#include "Attributes.h"
 		#include "BoardTypes.h"
 		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
 	/* Architecture specific utility includes: */
 		#if defined(__DOXYGEN__)
-			/** Type define for an unsigned integer the same width as the selected architecture's machine register. */
+			/** Type define for an unsigned integer the same width as the selected architecture's machine register.
+			 *  This is distinct from the non-specific standard int data type, whose width is machine dependant but
+			 *  which may not reflect the actual machine register width on some targets (e.g. AVR8).
+			 */
 			typedef MACHINE_REG_t uint_reg_t;
 		#elif (ARCH == ARCH_AVR8)
 			#include <avr/io.h>
@@ -156,7 +168,7 @@
 
 			#if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)
 				/** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always
-				 *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimiser
+				 *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer
 				 *  removes/reorders code to the point where break points cannot reliably be set.
 				 *
 				 *  \note This macro is not available for all architectures.
@@ -213,7 +225,7 @@
 					 *
 					 *  \return Pointer retrieved from PROGMEM space.
 					 */
-					#define pgm_read_ptr(Addr)          (void*)pgm_read_word(Address)
+					#define pgm_read_ptr(Address)        (void*)pgm_read_word(Address)
 				#endif
 			#endif
 			
@@ -257,7 +269,7 @@
 				 *
 				 *  \param Name  Unique name of the interrupt service routine.
 				 */
-				#define ISR(Name, ...)                  void Name (void) __attribute__((__interrupt__)); void Name (void)
+				#define ISR(Name, ...)                  void Name (void) __attribute__((__interrupt__)) __VA_ARGS__; void Name (void)
 			#endif
 
 		/* Inline Functions: */
@@ -387,6 +399,11 @@
 				GCC_MEMORY_BARRIER();
 			}
 
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
 #endif
 
 /** @} */