From 7fbb29369b865c06e37c074780ecf5a1f93080c9 Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Thu, 25 Aug 2011 06:39:33 -0700
Subject: [PATCH] utf8 is the default encoding for decoder, no need to
 explicitly define it

---
 include/jsx_decoder.hrl | 17 +++++++++++------
 src/jsx_utf8.erl        |  2 --
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/jsx_decoder.hrl b/include/jsx_decoder.hrl
index f0465a4..f489e0d 100644
--- a/include/jsx_decoder.hrl
+++ b/include/jsx_decoder.hrl
@@ -125,37 +125,42 @@ decoder(Opts) ->
 ).
 
 
-%% partial codepoint max size differs across encodings
--ifdef(utf8).
--define(encoding, utf8).
--define(utfx, utf8).
--define(partial_codepoint(Bin), byte_size(Bin) < 1).
--endif.
+%% utf8 is the default encoding
+-define(utf8, true).
 
 -ifdef(utf16).
+-undef(utf8).
 -define(encoding, utf16).
 -define(utfx, utf16).
 -define(partial_codepoint(Bin), byte_size(Bin) < 2).
 -endif.
 
 -ifdef(utf16le).
+-undef(utf8).
 -define(encoding, utf16le).
 -define(utfx, utf16-little).
 -define(partial_codepoint(Bin), byte_size(Bin) < 2).
 -endif.
     
 -ifdef(utf32).
+-undef(utf8).
 -define(encoding, utf32).
 -define(utfx, utf32).
 -define(partial_codepoint(Bin), byte_size(Bin) < 4).
 -endif.
 
 -ifdef(utf32le).
+-undef(utf8).
 -define(encoding, utf32le).
 -define(utfx, utf32-little).
 -define(partial_codepoint(Bin), byte_size(Bin) < 4).
 -endif.
 
+-ifdef(utf8).
+-define(encoding, utf8).
+-define(utfx, utf8).
+-define(partial_codepoint(Bin), byte_size(Bin) < 1).
+-endif.
 
 %% when parsing strings, the naive detection of partial codepoints is
 %%   insufficient. this incredibly anal function should detect all badly formed
diff --git a/src/jsx_utf8.erl b/src/jsx_utf8.erl
index 7c854e7..2d327b3 100644
--- a/src/jsx_utf8.erl
+++ b/src/jsx_utf8.erl
@@ -24,8 +24,6 @@
 
 -module(jsx_utf8).
 
--define(utf8, true).
-
 -include("../include/jsx_common.hrl").
 -include("../include/jsx_decoder.hrl").