commit eadc478e5084501235176d6bbe1c41195bee98ac
author Baptiste Lepilleur <baptiste.lepilleur@gmail.com> Mon May 02 21:09:30 2011 +0000
committer Baptiste Lepilleur <baptiste.lepilleur@gmail.com> Mon May 02 21:09:30 2011 +0000
tree 914eb7f6de038e9fe51099c2a20c0dcb9c4ee03b
parent 1837a1c50860e77045d0b8ed103c039c208022be

Fixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_IS_AMALGAMATION

include/json/features.h

diff --git a/include/json/features.h b/include/json/features.h
index 0b53db1..4353278 100644
--- a/include/json/features.h
+++ b/include/json/features.h
@@ -6,9 +6,9 @@
 #ifndef CPPTL_JSON_FEATURES_H_INCLUDED
 # define CPPTL_JSON_FEATURES_H_INCLUDED
 
-#if !defined(JSON_IS_AMALGATED)

+#if !defined(JSON_IS_AMALGAMATION)
 # include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGATED)

+#endif // if !defined(JSON_IS_AMALGAMATION)
 
 namespace Json {