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

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 69c4ff2c3..02fc98fdc 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -67,10 +67,19 @@
 		#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.
@@ -159,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.
@@ -390,6 +399,11 @@
 				GCC_MEMORY_BARRIER();
 			}
 
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
 #endif
 
 /** @} */