diff --git a/emit.cc b/emit.cc index 3ee29d4d0..cd2257ff0 100644 --- a/emit.cc +++ b/emit.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: emit.cc,v 1.54 2000/09/26 01:35:42 steve Exp $" +#ident "$Id: emit.cc,v 1.55 2000/11/04 01:54:01 steve Exp $" #endif /* @@ -467,7 +467,7 @@ bool emit(const Design*des, const char*type) { for (unsigned idx = 0 ; target_table[idx] ; idx += 1) { const struct target*tgt = target_table[idx]; - if (tgt->name == type) + if (strcmp(tgt->name, type) == 0) return des->emit(tgt->meth); } @@ -476,6 +476,9 @@ bool emit(const Design*des, const char*type) /* * $Log: emit.cc,v $ + * Revision 1.55 2000/11/04 01:54:01 steve + * Modifications in support of gcc 2.96 + * * Revision 1.54 2000/09/26 01:35:42 steve * Remove the obsolete NetEIdent class. * diff --git a/lexor.lex b/lexor.lex index bc7f936d1..adf846d39 100644 --- a/lexor.lex +++ b/lexor.lex @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: lexor.lex,v 1.51 2000/10/22 22:27:59 steve Exp $" +#ident "$Id: lexor.lex,v 1.52 2000/11/04 01:54:01 steve Exp $" #endif //# define YYSTYPE lexval @@ -966,7 +966,7 @@ static void process_timescale(const char*txt) pform_set_timescale(unit, prec); } -static int yywrap() +int yywrap() { return 1; } diff --git a/target.h b/target.h index c419b010a..1243a0424 100644 --- a/target.h +++ b/target.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: target.h,v 1.47 2000/09/26 01:35:43 steve Exp $" +#ident "$Id: target.h,v 1.48 2000/11/04 01:54:01 steve Exp $" #endif # include "netlist.h" @@ -38,7 +38,7 @@ * pointer to a target_t object that is the actual driver. */ struct target { - string name; + const char* name; struct target_t* meth; }; @@ -159,6 +159,9 @@ extern const struct target *target_table[]; /* * $Log: target.h,v $ + * Revision 1.48 2000/11/04 01:54:01 steve + * Modifications in support of gcc 2.96 + * * Revision 1.47 2000/09/26 01:35:43 steve * Remove the obsolete NetEIdent class. *