# HG changeset patch
# User Anil Madhavapeddy <anil@recoil.org>
# Date 1257218828 25200
# Node ID d7c37c5d250968684d45053a300b6f250d5f77f6
# Parent  7a17b2ab5cfcf560d46f938f23eb888ebec4e79a
rename the Sexpr module to Sexpr_marshal to avoid a case-insensitivity conflict with the SExpr module

Signed-off-by: Anil Madhavapeddy <anil@recoil.org>

diff -r 7a17b2ab5cfc -r d7c37c5d2509 sexpr/Makefile
--- a/sexpr/Makefile	Fri Oct 30 12:50:42 2009 +0000
+++ b/sexpr/Makefile	Mon Nov 02 20:27:08 2009 -0700
@@ -17,7 +17,7 @@
 OCAMLLIBDIR := $(shell ocamlc -where)
 OCAMLDESTDIR ?= $(OCAMLLIBDIR)
 
-OBJS = sExpr sExprLexer sExprParser sexpr
+OBJS = sExpr sExprLexer sExprParser sexpr_marshal
 INTF = $(foreach obj, $(OBJS),$(obj).cmi)
 LIBS = sexpr.cma sexpr.cmxa
 
diff -r 7a17b2ab5cfc -r d7c37c5d2509 sexpr/sexpr.ml
--- a/sexpr/sexpr.ml	Fri Oct 30 12:50:42 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-(*
- * Copyright (C) 2006-2009 Citrix Systems Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 only. with the special
- * exception on linking described in file LICENSE.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *)
-open Threadext
-
-let lock = Mutex.create ()
-
-let of_string s =
-	Mutex.execute lock
-		(fun () -> SExprParser.expr SExprLexer.token (Lexing.from_string s))
-
-let string_of = SExpr.string_of
diff -r 7a17b2ab5cfc -r d7c37c5d2509 sexpr/sexpr.mli
--- a/sexpr/sexpr.mli	Fri Oct 30 12:50:42 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-(*
- * Copyright (C) 2006-2009 Citrix Systems Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 only. with the special
- * exception on linking described in file LICENSE.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *)
-
-(** Thread-safe marshaller and unmarshaller for sexpr *)
-
-val of_string : string -> SExpr.t
-
-val string_of : SExpr.t -> string
diff -r 7a17b2ab5cfc -r d7c37c5d2509 sexpr/sexpr_marshal.ml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sexpr/sexpr_marshal.ml	Mon Nov 02 20:27:08 2009 -0700
@@ -0,0 +1,22 @@
+(*
+ * Copyright (C) 2006-2009 Citrix Systems Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *)
+open Threadext
+
+let lock = Mutex.create ()
+
+let of_string s =
+	Mutex.execute lock
+		(fun () -> SExprParser.expr SExprLexer.token (Lexing.from_string s))
+
+let string_of = SExpr.string_of
diff -r 7a17b2ab5cfc -r d7c37c5d2509 sexpr/sexpr_marshal.mli
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sexpr/sexpr_marshal.mli	Mon Nov 02 20:27:08 2009 -0700
@@ -0,0 +1,19 @@
+(*
+ * Copyright (C) 2006-2009 Citrix Systems Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *)
+
+(** Thread-safe marshaller and unmarshaller for sexpr *)
+
+val of_string : string -> SExpr.t
+
+val string_of : SExpr.t -> string