Ignore:
Timestamp:
Sep 19, 2006, 1:16:21 AM (19 years ago)
Author:
bird
Message:

Made it build again on linux.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gmake/variable.c

    r533 r534  
    109109typedef signed int int32_t;
    110110typedef signed short int int16_t;
    111 # endif 
     111# endif
    112112static inline unsigned long variable_hash_2i(register const unsigned char *var, register int length)
    113113{
     
    318318define_variable_in_set (const char *name, unsigned int length,
    319319                        char *value, unsigned int value_length, int duplicate_value,
    320                         enum variable_origin origin, int recursive, 
     320                        enum variable_origin origin, int recursive,
    321321                        struct variable_set *set, const struct floc *flocp)
    322322#else
    323323struct variable *
    324324define_variable_in_set (const char *name, unsigned int length,
    325                         char *value, enum variable_origin origin, 
    326                         int recursive, struct variable_set *set, 
     325                        char *value, enum variable_origin origin,
     326                        int recursive, struct variable_set *set,
    327327                        const struct floc *flocp)
    328 #endif 
     328#endif
    329329{
    330330  struct variable *v;
     
    386386            free (v->value);
    387387          v->value = xstrdup (value);
    388 #endif 
     388#endif
    389389          if (flocp != 0)
    390390            v->fileinfo = *flocp;
     
    426426#else
    427427  v->value = xstrdup (value);
    428 #endif 
     428#endif
    429429  if (flocp != 0)
    430430    v->fileinfo = *flocp;
     
    10861086      v->value_length = strlen (v->value);
    10871087      v->value_alloc_len = v->value_length + 1;
    1088 #endif 
     1088#endif
    10891089    }
    10901090#endif
     
    12741274#ifdef CONFIG_WITH_VALUE_LENGTH
    12751275static struct variable *
    1276 do_variable_definition_append (const struct floc *flocp, struct variable *v, char *value, 
    1277                                enum Variable_origin origin)
     1276do_variable_definition_append (const struct floc *flocp, struct variable *v, char *value,
     1277                               enum variable_origin origin)
    12781278{
    12791279  if (env_overrides && origin == o_env)
     
    12961296    v->fileinfo = *flocp;
    12971297
    1298   /* The juicy bits, append the specified value to the variable 
     1298  /* The juicy bits, append the specified value to the variable
    12991299     This is a heavily exercied code path in kBuild. */
    13001300  if (v->recursive)
     
    13221322      v->value_length = new_value_len;
    13231323    }
    1324   else 
     1324  else
    13251325    {
    13261326      /* The previous definition of the variable was simple.
     
    13511351# ifdef CONFIG_WITH_VALUE_LENGTH
    13521352  unsigned int value_len = ~0U;
    1353 # endif 
     1353# endif
    13541354
    13551355  /* Calculate the variable's new value in VALUE.  */
     
    15431543# ifdef CONFIG_WITH_VALUE_LENGTH
    15441544                                      ~0U, 1 /* duplicate_value */,
    1545 # endif 
     1545# endif
    15461546                                      origin, flavor == f_recursive,
    15471547                                      (target_var
     
    15561556      if (alloc_value)
    15571557        free (alloc_value);
    1558 # endif 
     1558# endif
    15591559    }
    15601560  else
     
    15811581  if (alloc_value)
    15821582    free (alloc_value);
    1583 #endif 
     1583#endif
    15841584
    15851585  return v;
     
    16811681#ifdef CONFIG_WITH_VALUE_LENGTH
    16821682  v->value_length = v->value_alloc_len = -1;
    1683 #endif 
     1683#endif
    16841684
    16851685  /* Expand the name, so "$(foo)bar = baz" works.  */
Note: See TracChangeset for help on using the changeset viewer.