From 0c005c815953024f79413fd1463f9d314fb738d5 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Mon, 17 Sep 2012 11:51:44 +0200
Subject: [PATCH] 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       | 1 +
 src/sanity/80columns.test | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/bin/common_r.hh b/src/bin/common_r.hh
index 045b51daa..dc301154c 100644
--- a/src/bin/common_r.hh
+++ b/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'
diff --git a/src/sanity/80columns.test b/src/sanity/80columns.test
index a2ed6076b..bbb04878a 100755
--- a/src/sanity/80columns.test
+++ b/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='.'