More fixes for the OS X builds.

* src/bin/common_r.hh: Include common_sys.hh first.
* src/sanity/80columns.test: Set LANG.

src/bin/common_r.hh

@@ -22,6 +22,7 @@
 #ifndef SPOT_BIN_COMMON_R_HH
 #define SPOT_BIN_COMMON_R_HH
 
+#include "common_sys.hh"
 #include "ltlvisit/simplify.hh"
 
 #define OPT_R 'r'

src/sanity/80columns.test

@@ -6,9 +6,14 @@ set -e
 
 rm -f failures
 
+LANG=en_US.UTF-8
+export LANG
+
 if [ "`echo '{r₁|r₂|r₃}' | wc -m`" != 11 ]; then
-  # The current local does not grok unicode.
-  # We still run this test, but only on lines are that purely ascii.
+  LANG=C
+  export LANG
+  # The current locale does not grok unicode.
+  # We still run this test, but only on lines that are purely ascii.
   x='[^	-~]' # This blank is a tab.
 else
   x='.'