X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=utils.ml;h=0bf18fa94a791d714b0c7bcc54da359a39ebb427;hb=refs%2Ftags%2F0.1.7;hp=e0c2ff1aed925da2e70e26343324ebe51bdcf863;hpb=4fa4ca7430421c477e7f813819a8a70279de0a65;p=guestfs-browser.git

diff --git a/utils.ml b/utils.ml
index e0c2ff1..0bf18fa 100644
--- a/utils.ml
+++ b/utils.ml
@@ -18,8 +18,6 @@
 
 open ExtString
 open ExtList
-open CamomileLibrary
-open Default.Camomile
 
 open Printf
 
@@ -164,9 +162,12 @@ let tmpdir () =
        ignore (Sys.command cmd));
   tmpdir
 
-let utf16le = CharEncoding.utf16le
-let utf8 = CharEncoding.utf8
-let recode = CharEncoding.recode_string ~in_enc:utf16le ~out_enc:utf8
+module CE = CamomileLibraryDefault.Camomile.CharEncoding
+module UTF8 = CamomileLibraryDefault.Camomile.UTF8
+module UChar = CamomileLibraryDefault.Camomile.UChar
+let utf16le = CE.utf16le
+let utf8 = CE.utf8
+let recode = CE.recode_string ~in_enc:utf16le ~out_enc:utf8
 
 let windows_string_to_utf8 str =
   let str = recode str in