Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / xbt / graphxml.l

diff --git a/src/xbt/graphxml.l b/src/xbt/graphxml.l
index 373da6d..d51f926 100644 (file)
--- a/src/xbt/graphxml.l
+++ b/src/xbt/graphxml.l
@@ -1,10 +1,9 @@
-/* Validating XML processor for xbt/graphxml.dtd.
- * Generated 2007/12/19 15:09:56.
+/* Validating XML processor for src/xbt/graphxml.dtd.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  * FleXML is Copyright (C) 2003-2006 Martin Quinson.  All rights reserved.
- * (Id: flexml.pl,v 1.63 2007/10/11 14:46:08 mquinson Exp).
+ * (Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -51,7 +50,7 @@
 const char rcs_graphxml_flexml_skeleton[] =
  "$" "Id: skel,v 1.40 2007/10/11 09:57:24 mquinson Exp $";
 const char rcs_graphxml_flexml[] =
- "$" "Id: flexml.pl,v 1.63 2007/10/11 14:46:08 mquinson Exp $";
+ "$" "Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp $";
 
 /* ANSI headers. */
 #include <stdlib.h> /* for realloc() -- needed here when using flex 2.5.4 */
@@ -61,7 +60,7 @@ const char rcs_graphxml_flexml[] =
 #include <stdarg.h>
 #include <ctype.h>
      
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
+#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
 # ifndef __STRICT_ANSI__
 #  include <io.h>
 #  include <process.h>
@@ -494,7 +493,7 @@ const char* *graphxml_statenames=NULL;
   *     data            CDATA               ""
   * >  */
 
-<S_graphxml_graph_2,E_graphxml_graph>"<edge"{s} FAIL("Starting tag <edge> is not allowed here.");
+<E_graphxml_graph,S_graphxml_graph_2>"<edge"{s} FAIL("Starting tag <edge> is not allowed here.");
 
 <ROOT_graphxml_edge,S_graphxml_graph_1,S_graphxml_graph_3,S_graphxml_graph_5,S_graphxml_graph_4,S_graphxml_graph>"<edge"{s} {
   AX_graphxml_edge_label = 0;