This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Minor Fortran front end fix for MinGW


mingwrt headers declare a function named eof().  Renaming eof in parse.c
to a slightly more descriptive name fixes this conflict.

2004-09-12  Aaron W. LaFramboise <aaronavay62@aaronwl.com>

	* parse.c (eof_buf): Rename eof to eof_buf.
	(unexpected_eof): Same.
	(gfc_parse_file): Same.

Index: gcc/gcc/fortran/parse.c
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/fortran/parse.c,v
retrieving revision 1.18
diff -c -3 -p -r1.18 parse.c
*** gcc/gcc/fortran/parse.c	30 Aug 2004 19:08:38 -0000	1.18
--- gcc/gcc/fortran/parse.c	11 Sep 2004 23:47:50 -0000
*************** Software Foundation, 59 Temple Place - S
*** 36,42 ****
  gfc_st_label *gfc_statement_label;

  static locus label_locus;
! static jmp_buf eof;

  gfc_state_data *gfc_state_stack;

--- 36,42 ----
  gfc_st_label *gfc_statement_label;

  static locus label_locus;
! static jmp_buf eof_buf;

  gfc_state_data *gfc_state_stack;

*************** unexpected_eof (void)
*** 1252,1258 ****
    gfc_current_ns->code = (p && p->previous) ? p->head : NULL;
    gfc_done_2 ();

!   longjmp (eof, 1);
  }


--- 1252,1258 ----
    gfc_current_ns->code = (p && p->previous) ? p->head : NULL;
    gfc_done_2 ();

!   longjmp (eof_buf, 1);
  }


*************** gfc_parse_file (void)
*** 2536,2542 ****

    gfc_statement_label = NULL;

!   if (setjmp (eof))
      return FAILURE;	/* Come here on unexpected EOF */

    seen_program = 0;
--- 2536,2542 ----

    gfc_statement_label = NULL;

!   if (setjmp (eof_buf))
      return FAILURE;	/* Come here on unexpected EOF */

    seen_program = 0;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]