From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 9 Mar 2016 14:27:06 +0000 (+0100)
Subject: guess what? Another attempt with teh #if builds
X-Git-Tag: v3_13~453^2~13
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/aab838f05318939b5d95a1006a22ed05a7fece89

guess what? Another attempt with teh #if builds
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 144bea937e..9a61a62483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,6 +186,7 @@ include_directories(${INCLUDES})
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake)
 
 ### Determine the assembly flavor that we need today
+set(HAVE_RAW_CONTEXTS 0)
 include(CMakeDetermineSystem)
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
   IF(${ARCH_32_BITS})
@@ -198,7 +199,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
     set(PROCESSOR_x86_64 1)
   ENDIF()
   if (WIN32)
-    message(STATUS "Disable fast raw contextes on Windows.")
+    message(STATUS "Disable fast raw contexts on Windows.")
   else()
     set(HAVE_RAW_CONTEXTS 1)
   endif()
diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index 2ed7b560a2..2cae6d53d0 100644
--- a/src/xbt/automaton/automatonparse_promela.c
+++ b/src/xbt/automaton/automatonparse_promela.c
@@ -9,7 +9,10 @@
 #include "xbt/automaton.h"
 #include "src/internal_config.h"
 #include <errno.h>
-#include <string.h>             /* strerror */
+#include <string.h>   /* strerror */
+#if HAVE_UNISTD_H
+#include <unistd.h>   /* isatty */
+#endif
 
 static xbt_automaton_t parsed_automaton;
 char* state_id_src;