Ignore:
Timestamp:
Jun 17, 2012, 10:45:31 PM (13 years ago)
Author:
bird
Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:
trunk/src/kmk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/kmk

    • Property svn:ignore
      •  

        old new  
        1313stamp-*
        1414makebook*
         15
        1516.*gdbinit
         17.gdb_history
         18
        1619*.dep
        1720*.dvi
         
        3134*.pg
        3235*.pgs
         36
        3337README
        3438README.DOS
        3539README.W32
         40README.OS2
        3641aclocal.m4
        3742autom4te.cache
         
        5257config.h.W32
        5358config.h-vms
         59
        5460loadavg
        5561loadavg.c
        5662make
         63
        5764.deps
        5865.dep_segment
         66ID
         67TAGS
         68
        5969_*
        6070sun4
         
        7282sol2
        7383i486-linux
         84
        7485customs
         86
        7587install-sh
        7688mkinstalldirs
         89
         90.directive.asc
  • trunk/src/kmk/variable.h

    r2005 r2591  
    8282                                   exported.  */
    8383    unsigned int expanding:1;   /* Nonzero if currently being expanded.  */
     84    unsigned int private_var:1; /* Nonzero avoids inheritance of this
     85                                   target-specific variable.  */
    8486    unsigned int exp_count:EXP_COUNT_BITS;
    8587                                /* If >1, allow this many self-referential
     
    122124    struct variable_set_list *next;     /* Link in the chain.  */
    123125    struct variable_set *set;           /* Variable set.  */
     126    int next_is_parent;                 /* True if next is a parent target.  */
    124127  };
    125128
     
    137140extern char *variable_buffer;
    138141extern struct variable_set_list *current_variable_set_list;
     142extern struct variable *default_goal_var;
     143
    139144#ifdef KMK
    140145extern unsigned int variable_buffer_length;
    141 #define VARIABLE_BUFFER_ZONE    5
     146# define VARIABLE_BUFFER_ZONE   5
    142147#endif
    143148
    144149/* expand.c */
    145150#ifndef KMK
    146 char *variable_buffer_output (char *ptr, const char *string, unsigned int length);
     151char *
     152variable_buffer_output (char *ptr, const char *string, unsigned int length);
    147153#else /* KMK */
    148154/* Subroutine of variable_expand and friends:
     
    209215char *expand_argument (const char *str, const char *end);
    210216#ifndef CONFIG_WITH_VALUE_LENGTH
    211 char *variable_expand_string (char *line, const char *string, long length);
     217char *
     218variable_expand_string (char *line, const char *string, long length);
    212219#else  /* CONFIG_WITH_VALUE_LENGTH */
    213 char *variable_expand_string_2 (char *line, const char *string, long length, char **eol);
     220char *
     221variable_expand_string_2 (char *line, const char *string, long length, char **eol);
    214222__inline static char *
    215223variable_expand_string (char *line, const char *string, long length)
     
    314322                                         enum variable_flavor flavor,
    315323                                         int target_var);
    316 struct variable *parse_variable_definition (struct variable *v, char *line);
    317 struct variable *try_variable_definition (const struct floc *flocp, char *line,
    318                                           enum variable_origin origin,
    319                                           int target_var);
    320324#else  /* CONFIG_WITH_VALUE_LENGTH */
    321325# define do_variable_definition(flocp, varname, value, origin, flavor, target_var) \
    322326    do_variable_definition_2 ((flocp), (varname), (value), ~0U, 0, NULL, \
    323327                              (origin), (flavor), (target_var))
    324 
    325328struct variable *do_variable_definition_2 (const struct floc *flocp,
    326329                                           const char *varname,
     
    331334                                           enum variable_flavor flavor,
    332335                                           int target_var);
    333 struct variable *parse_variable_definition (struct variable *v, char *line,
    334                                             char *eos);
    335 struct variable *try_variable_definition (const struct floc *flocp, char *line,
    336                                           char *eos,
     336#endif /* CONFIG_WITH_VALUE_LENGTH */
     337char *parse_variable_definition (const char *line,
     338                                          enum variable_flavor *flavor);
     339struct variable *assign_variable_definition (struct variable *v, char *line IF_WITH_VALUE_LENGTH_PARAM(char *eos));
     340struct variable *try_variable_definition (const struct floc *flocp, char *line
     341                                          IF_WITH_VALUE_LENGTH_PARAM(char *eos),
    337342                                          enum variable_origin origin,
    338343                                          int target_var);
    339 #endif /* CONFIG_WITH_VALUE_LENGTH */
    340344void init_hash_global_variable_set (void);
    341345void hash_init_function_table (void);
     
    367371                                 current_variable_set_list->set,NILF)
    368372
     373/* Define a variable with a constant name in the current variable set.  */
     374
     375#define define_variable_cname(n,v,o,r) \
     376          define_variable_in_set((n),(sizeof (n) - 1),(v),~0U,1,(o),(r),\
     377                                 current_variable_set_list->set,NILF)
     378
    369379/* Define a variable with a location in the current variable set.  */
    370380
     
    401411                                 current_variable_set_list->set,NILF)           /* force merge conflict */
    402412
     413/* Define a variable with a constant name in the current variable set.  */
     414
     415#define define_variable_cname(n,v,o,r) \
     416          define_variable_in_set((n),(sizeof (n) - 1),(v),(o),(r),\
     417                                 current_variable_set_list->set,NILF)           /* force merge conflict */
     418
    403419/* Define a variable with a location in the current variable set.  */
    404420
     
    418434
    419435#endif /* !CONFIG_WITH_VALUE_LENGTH */
     436
     437void undefine_variable_in_set (const char *name, unsigned int length,
     438                                         enum variable_origin origin,
     439                                         struct variable_set *set);
     440
     441/* Remove variable from the current variable set. */
     442
     443#define undefine_variable_global(n,l,o) \
     444          undefine_variable_in_set((n),(l),(o),NULL)
    420445
    421446/* Warn that NAME is an undefined variable.  */
     
    444469#endif
    445470#define MAKELEVEL_LENGTH (sizeof (MAKELEVEL_NAME) - 1)
     471
Note: See TracChangeset for help on using the changeset viewer.