From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 9 Jul 2016 14:59:20 +0000 (+0200)
Subject: kill our last '#ifdef _MSC_VER'
X-Git-Tag: v3_14~779
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/972496c1b337f99a7009daf0dfae85baf5f0a9ca?ds=sidebyside

kill our last '#ifdef _MSC_VER'
---

diff --git a/src/xbt/automaton/automaton_lexer.yy.c b/src/xbt/automaton/automaton_lexer.yy.c
index 7534c028ba..5541542d3d 100644
--- a/src/xbt/automaton/automaton_lexer.yy.c
+++ b/src/xbt/automaton/automaton_lexer.yy.c
@@ -537,13 +537,6 @@ char *xbt_automaton_parser_text;
 #include "simgrid_config.h"
 #if !HAVE_UNISTD_H
 #define YY_NO_UNISTD_H /* hello Windows */
-
-#ifdef _MSC_VER
-# include <io.h>
-# include <process.h>
-# define _CRT_SECURE_NO_WARNINGS
-# define _CRT_NONSTDC_NO_WARNINGS
-#endif
 #endif
 
 #include <stdio.h>
@@ -551,7 +544,7 @@ char *xbt_automaton_parser_text;
   
   extern YYSTYPE yylval;
  
-#line 555 "automaton_lexer.yy.c"
+#line 548 "automaton_lexer.yy.c"
 
 #define INITIAL 0
 
@@ -769,10 +762,10 @@ YY_DECL
 		}
 
 	{
-#line 45 "parserPromela.lex"
+#line 38 "parserPromela.lex"
 
 
-#line 776 "automaton_lexer.yy.c"
+#line 769 "automaton_lexer.yy.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -831,118 +824,118 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 47 "parserPromela.lex"
+#line 40 "parserPromela.lex"
 { return (NEVER); }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 48 "parserPromela.lex"
+#line 41 "parserPromela.lex"
 { return (IF); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 49 "parserPromela.lex"
+#line 42 "parserPromela.lex"
 { return (FI); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 50 "parserPromela.lex"
+#line 43 "parserPromela.lex"
 { return (IMPLIES); }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 51 "parserPromela.lex"
+#line 44 "parserPromela.lex"
 { return (GOTO); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 52 "parserPromela.lex"
+#line 45 "parserPromela.lex"
 { return (AND); }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 53 "parserPromela.lex"
+#line 46 "parserPromela.lex"
 { return (OR); }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 54 "parserPromela.lex"
+#line 47 "parserPromela.lex"
 { return (NOT); }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 55 "parserPromela.lex"
+#line 48 "parserPromela.lex"
 { return (LEFT_PAR); }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 56 "parserPromela.lex"
+#line 49 "parserPromela.lex"
 { return (RIGHT_PAR); }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 57 "parserPromela.lex"
+#line 50 "parserPromela.lex"
 { return (CASE); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 58 "parserPromela.lex"
+#line 51 "parserPromela.lex"
 { return (COLON); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 59 "parserPromela.lex"
+#line 52 "parserPromela.lex"
 { return (SEMI_COLON); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 60 "parserPromela.lex"
+#line 53 "parserPromela.lex"
 { return (CASE_TRUE); }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 61 "parserPromela.lex"
+#line 54 "parserPromela.lex"
 { return (LEFT_BRACE); }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 62 "parserPromela.lex"
+#line 55 "parserPromela.lex"
 { return (RIGHT_BRACE); }
 	YY_BREAK
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 65 "parserPromela.lex"
+#line 58 "parserPromela.lex"
 { }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 67 "parserPromela.lex"
+#line 60 "parserPromela.lex"
 { }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 70 "parserPromela.lex"
+#line 63 "parserPromela.lex"
 { sscanf(xbt_automaton_parser_text,"%lf",&yylval.real); 
                             return (LITT_REEL); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 73 "parserPromela.lex"
+#line 66 "parserPromela.lex"
 { sscanf(xbt_automaton_parser_text,"%d",&yylval.integer); 
                             return (LITT_ENT); }
 	YY_BREAK
 case 21:
 /* rule 21 can match eol */
 YY_RULE_SETUP
-#line 76 "parserPromela.lex"
+#line 69 "parserPromela.lex"
 { yylval.string=(char *)malloc(strlen(xbt_automaton_parser_text)+1);
                             sscanf(xbt_automaton_parser_text,"%s",yylval.string); 
                             return (LITT_CHAINE); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 80 "parserPromela.lex"
+#line 73 "parserPromela.lex"
 { yylval.string=(char *)malloc(strlen(xbt_automaton_parser_text)+1);
                             sscanf(xbt_automaton_parser_text,"%s",yylval.string);
 			                      return (ID); }
@@ -950,20 +943,20 @@ YY_RULE_SETUP
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 84 "parserPromela.lex"
+#line 77 "parserPromela.lex"
 { }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 86 "parserPromela.lex"
+#line 79 "parserPromela.lex"
 { }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 88 "parserPromela.lex"
+#line 81 "parserPromela.lex"
 ECHO;
 	YY_BREAK
-#line 967 "automaton_lexer.yy.c"
+#line 960 "automaton_lexer.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1964,7 +1957,7 @@ void xbt_automaton_parser_free (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 88 "parserPromela.lex"
+#line 81 "parserPromela.lex"
 
 
 
diff --git a/src/xbt/automaton/parserPromela.lex b/src/xbt/automaton/parserPromela.lex
index b0dd1eb0f4..0d4804b612 100644
--- a/src/xbt/automaton/parserPromela.lex
+++ b/src/xbt/automaton/parserPromela.lex
@@ -11,13 +11,6 @@
 #include "simgrid_config.h"
 #if !HAVE_UNISTD_H
 #define YY_NO_UNISTD_H /* hello Windows */
-
-#ifdef _MSC_VER
-# include <io.h>
-# include <process.h>
-# define _CRT_SECURE_NO_WARNINGS
-# define _CRT_NONSTDC_NO_WARNINGS
-#endif
 #endif
 
 #include <stdio.h>