aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Common
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-12-26 15:44:10 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-12-26 15:44:10 +0000
commit6026b9128b3e9095375224731dd95e70c3edc206 (patch)
tree4b6973cf662422ba104ab4c101560492560cffeb /LUFA/Common
parentc05e7cd7d9ec8cb593e837ba9928a02c3449e55f (diff)
downloadlufa-6026b9128b3e9095375224731dd95e70c3edc206.tar.gz
lufa-6026b9128b3e9095375224731dd95e70c3edc206.tar.bz2
lufa-6026b9128b3e9095375224731dd95e70c3edc206.zip
Fix compile errors from the changes to the SerialStream and board Temperature drivers.
Diffstat (limited to 'LUFA/Common')
-rw-r--r--LUFA/Common/Common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 1e9e9663f..d2d91fb37 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -106,7 +106,7 @@
* must be pre-initialized before this macro is run and linked to an output device, such as the AVR's USART
* peripheral.
*
- * The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {x} failed."
+ * The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed."
*
* \param[in] Condition Condition that will be evaluated,
*
@@ -114,7 +114,7 @@
*/
#define STDOUT_ASSERT(Condition) MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: " \
"Assertion \"%s\" failed.\r\n"), \
- __FILE__, __func__, __LINE__, #x); } }MACROE
+ __FILE__, __func__, __LINE__, #Condition); } }MACROE
/** Forces GCC to use pointer indirection (via the AVR's pointer register pairs) when accessing the given
* struct pointer. In some cases GCC will emit non-optimal assembly code when accessing a structure through