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

git-svn-id: http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp/include@187 1f120ed1-78a5-a849-adca-83f0a9e25bb6
diff --git a/json/config.h b/json/config.h
index 24991d5..7609d45 100644
--- a/json/config.h
+++ b/json/config.h
@@ -31,7 +31,7 @@
 /// If defined, indicates that the source file is amalgated
 /// to prevent private header inclusion.
 /// Remarks: it is automatically defined in the generated amalgated header.
-// #define JSON_IS_AMALGATED
+// #define JSON_IS_AMALGAMATION
 
 
 # ifdef JSON_IN_CPPTL
diff --git a/json/features.h b/json/features.h
index 0b53db1..4353278 100644
--- a/json/features.h
+++ b/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 {
 
diff --git a/json/forwards.h b/json/forwards.h
index 083d44f..ab863da 100644
--- a/json/forwards.h
+++ b/json/forwards.h
@@ -6,9 +6,9 @@
 #ifndef JSON_FORWARDS_H_INCLUDED
 # define JSON_FORWARDS_H_INCLUDED
 
-#if !defined(JSON_IS_AMALGATED)
+#if !defined(JSON_IS_AMALGAMATION)
 # include "config.h"
-#endif // if !defined(JSON_IS_AMALGATED)
+#endif // if !defined(JSON_IS_AMALGAMATION)
 
 namespace Json {
 
diff --git a/json/reader.h b/json/reader.h
index 34dc785..0a324df 100644
--- a/json/reader.h
+++ b/json/reader.h
@@ -6,10 +6,10 @@
 #ifndef CPPTL_JSON_READER_H_INCLUDED
 # define CPPTL_JSON_READER_H_INCLUDED
 
-#if !defined(JSON_IS_AMALGATED)
+#if !defined(JSON_IS_AMALGAMATION)
 # include "features.h"
 # include "value.h"
-#endif // if !defined(JSON_IS_AMALGATED)
+#endif // if !defined(JSON_IS_AMALGAMATION)
 # include <deque>
 # include <stack>
 # include <string>
diff --git a/json/value.h b/json/value.h
index c9c7e1d..32e3455 100644
--- a/json/value.h
+++ b/json/value.h
@@ -6,9 +6,9 @@
 #ifndef CPPTL_JSON_H_INCLUDED
 # define CPPTL_JSON_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)
 # include <string>
 # include <vector>
 
diff --git a/json/writer.h b/json/writer.h
index cb0bd9b..4789363 100644
--- a/json/writer.h
+++ b/json/writer.h
@@ -6,9 +6,9 @@
 #ifndef JSON_WRITER_H_INCLUDED
 # define JSON_WRITER_H_INCLUDED
 
-#if !defined(JSON_IS_AMALGATED)
+#if !defined(JSON_IS_AMALGAMATION)
 # include "value.h"
-#endif // if !defined(JSON_IS_AMALGATED)
+#endif // if !defined(JSON_IS_AMALGAMATION)
 # include <vector>
 # include <string>
 # include <iostream>