[Ups-cvs] ups/ups ci_lex.c,1.2,1.3

[Tom H. <th...@us...>]

Update of /cvsroot/ups/ups/ups
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26702/ups

Modified Files:
	ci_lex.c 
Log Message:
Rename getline to get_line to avoid conflict with system headers.


Index: ci_lex.c
===================================================================
RCS file: /cvsroot/ups/ups/ups/ci_lex.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ci_lex.c	4 Nov 2002 14:56:20 -0000	1.2
--- ci_lex.c	26 Jun 2009 14:39:29 -0000	1.3
***************
*** 77,81 ****
  static int get_float_constant PROTO((lex_env_t *le, const char *line,
  		    const char **p_end, constant_t **p_co));
! static const char *getline PROTO((lex_env_t *le));
  static int get_string PROTO((lex_env_t *le, const char *line, string_const_t *sc));
  static bool is_aggr_type_specifier PROTO((token_t token));
--- 77,81 ----
  static int get_float_constant PROTO((lex_env_t *le, const char *line,
  		    const char **p_end, constant_t **p_co));
! static const char *get_line PROTO((lex_env_t *le));
  static int get_string PROTO((lex_env_t *le, const char *line, string_const_t *sc));
  static bool is_aggr_type_specifier PROTO((token_t token));
***************
*** 382,386 ****
  
  static const char *
! getline(le)
  lex_env_t *le;
  {
--- 382,386 ----
  
  static const char *
! get_line(le)
  lex_env_t *le;
  {
***************
*** 417,421 ****
  		break;
  
! 	    if ((line = getline(le)) == NULL)
  		break;
  #ifdef DEBUG
--- 417,421 ----
  		break;
  
! 	    if ((line = get_line(le)) == NULL)
  		break;
  #ifdef DEBUG
***************
*** 1129,1133 ****
  	    ch = *line;
  	else if (*++line == '\n') {
! 	    line = getline(le);
  	    ch = (line != NULL) ? *line : '\0';
  	}
--- 1129,1133 ----
  	    ch = *line;
  	else if (*++line == '\n') {
! 	    line = get_line(le);
  	    ch = (line != NULL) ? *line : '\0';
  	}