# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1386627953 18000
# Node ID f1c211936557be068f04d067b409e20ee118cf15
# Parent  b6aee1d5b9b131cf5d7ff727093af2e9b55c8eef# Parent  afdc823563de23f4931d52f9f8a8324bdfc4f256
Merge

diff -r b6aee1d5b9b1 -r f1c211936557 doc/manual.tex
--- a/doc/manual.tex	Mon Dec 09 17:23:25 2013 -0500
+++ b/doc/manual.tex	Mon Dec 09 17:25:53 2013 -0500
@@ -275,6 +275,8 @@
 
 \item \texttt{-print-ccompiler}: Print the C compiler being used.
 
+\item \texttt{-print-cinclude}: Print the name of the directory where C/C++ header files are installed.
+
 \item \texttt{-protocol [http|cgi|fastcgi|static]}: Set the protocol that the generated application speaks.
   \begin{itemize}
   \item \texttt{http}: This is the default.  It is for building standalone web servers that can be accessed by web browsers directly.
diff -r b6aee1d5b9b1 -r f1c211936557 src/main.mlton.sml
--- a/src/main.mlton.sml	Mon Dec 09 17:23:25 2013 -0500
+++ b/src/main.mlton.sml	Mon Dec 09 17:25:53 2013 -0500
@@ -56,8 +56,10 @@
 		               raise Code OS.Process.success)
         fun printNumericVersion () = (print (Config.versionNumber ^ "\n");
 			              raise Code OS.Process.success)
-        fun printCCompiler () = (print ((Settings.getCCompiler ()) ^ "\n");
-			              raise Code OS.Process.success)
+        fun printCCompiler () = (print (Settings.getCCompiler () ^ "\n");
+			         raise Code OS.Process.success)
+        fun printCInclude () = (print (Config.includ ^ "\n");
+			        raise Code OS.Process.success)
 
         fun doArgs args =
             case args of
@@ -71,6 +73,8 @@
                  doArgs rest)
               | "-print-ccompiler" :: rest =>
                   printCCompiler ()
+              | "-print-cinclude" :: rest =>
+                  printCInclude ()
               | "-ccompiler" :: ccomp :: rest =>
                 (Settings.setCCompiler ccomp;
                  doArgs rest)
diff -r b6aee1d5b9b1 -r f1c211936557 src/monoize.sml
--- a/src/monoize.sml	Mon Dec 09 17:23:25 2013 -0500
+++ b/src/monoize.sml	Mon Dec 09 17:25:53 2013 -0500
@@ -215,6 +215,7 @@
 
                   | L.CFfi ("Basis", "unit") => (L'.TRecord [], loc)
                   | L.CFfi ("Basis", "page") => (L'.TFfi ("Basis", "string"), loc)
+                  | L.CFfi ("Basis", "xhead") => (L'.TFfi ("Basis", "string"), loc)
                   | L.CFfi ("Basis", "xbody") => (L'.TFfi ("Basis", "string"), loc)
                   | L.CFfi ("Basis", "xtable") => (L'.TFfi ("Basis", "string"), loc)
                   | L.CFfi ("Basis", "xtr") => (L'.TFfi ("Basis", "string"), loc)