pike.git/ src/ builtin_functions.c

Branch: Tag:

2003-08-04

2003-08-04 15:39:38 by Henrik Grubbström (Grubba) <grubba@grubba.org>

The macro MIN() is not always present...

Rev: src/builtin_functions.c:1.500

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: builtin_functions.c,v 1.499 2003/08/03 02:34:46 mast Exp $ + || $Id: builtin_functions.c,v 1.500 2003/08/04 15:39:38 grubba Exp $   */      #include "global.h" - RCSID("$Id: builtin_functions.c,v 1.499 2003/08/03 02:34:46 mast Exp $"); + RCSID("$Id: builtin_functions.c,v 1.500 2003/08/04 15:39:38 grubba Exp $");   #include "interpret.h"   #include "svalue.h"   #include "pike_macros.h"
1900:    Pike_fatal ("The type check for this_object() failed.\n");   #endif    level = CDR (n)->u.sval.u.integer; -  for (i = MIN (level, compilation_depth); i; i--, state = state->previous) -  state->new_program->flags |= PROGRAM_USES_PARENT | PROGRAM_NEEDS_PARENT; +  for (i = MINIMUM(level, compilation_depth); i; +  i--, state = state->previous) { +  state->new_program->flags |= +  PROGRAM_USES_PARENT | PROGRAM_NEEDS_PARENT;    }    } -  +  }       /* We can only improve the type when accessing the innermost object:    * Since this_object always follows the object pointers it might not
6137:    nsec = args && !UNSAFE_IS_ZERO(Pike_sp-args);       pop_n_elems(args); -  if (nsec) +  if (args)    push_int64(time);    else    push_int64(time/1000);