Changeset 2591 for trunk/src/kmk/dep.h


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/dep.h

    r1993 r2591  
    11/* Definitions of dependency data structures for GNU Make.
    22Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
    3 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
    4 Foundation, Inc.
     31998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
     42010 Free Software Foundation, Inc.
    55This file is part of GNU Make.
    66
    … …  
    4444    unsigned int staticpattern : 1;
    4545    unsigned int need_2nd_expansion : 1;
     46    unsigned int dontcare : 1;
     47
    4648#ifdef CONFIG_WITH_INCLUDEDEP
    4749    unsigned int includedep : 1;
    … …  
    5961
    6062
     63#define PARSEFS_NONE    (0x0000)
     64#define PARSEFS_NOSTRIP (0x0001)
     65#define PARSEFS_NOAR    (0x0002)
     66#define PARSEFS_NOGLOB  (0x0004)
     67#define PARSEFS_EXISTS  (0x0008)
     68#define PARSEFS_NOCACHE (0x0010)
     69
    6170#ifndef CONFIG_WITH_ALLOC_CACHES
    62 struct nameseq *multi_glob (struct nameseq *chain, unsigned int size);
     71#define PARSE_FILE_SEQ(_s,_t,_c,_p,_f) \
     72            (_t *)parse_file_seq ((_s),sizeof (_t),(_c),(_p),(_f))
    6373#else
    64 struct nameseq *multi_glob (struct nameseq *chain, struct alloccache *cache);
     74# define PARSE_FILE_SEQ(_s,_t,_c,_p,_f) \
     75            (_t *)parse_file_seq ((_s),sizeof (_t),(_c),(_p),(_f), \
     76                                  &PARSE_FILE_SEQ_IGNORE_ ## _t ## _cache)
     77# define PARSE_FILE_SEQ_IGNORE_struct
    6578#endif
     79
    6680#ifdef VMS
    67 struct nameseq *parse_file_seq ();
     81void *parse_file_seq ();
    6882#else
    69 # ifndef CONFIG_WITH_ALLOC_CACHES
    70 struct nameseq *parse_file_seq (char **stringp, int stopchar, unsigned int size, int strip);
    71 # else
    72 struct nameseq *parse_file_seq (char **stringp, int stopchar, struct alloccache *cache, int strip);
    73 # endif
     83void *parse_file_seq (char **stringp, unsigned int size,
     84                      int stopchar, const char *prefix, int flags
     85                      IF_WITH_ALLOC_CACHES_PARAM(struct alloccache *cache));
    7486#endif
     87
    7588char *tilde_expand (const char *name);
    7689
    … …  
    7992#endif
    8093
    81 #define dep_name(d) ((d)->name == 0 ? (d)->file->name : (d)->name)
     94#define dep_name(d)     ((d)->name == 0 ? (d)->file->name : (d)->name)
    8295
    83 struct dep *alloc_dep (void);
    84 void free_dep (struct dep *d);
     96
     97#ifndef CONFIG_WITH_ALLOC_CACHES
     98#define alloc_dep()     (xcalloc (sizeof (struct dep)))
     99#define free_ns(_n)     free (_n)
     100#define free_dep(_d)    free_ns (_d)
     101#else
     102#define alloc_dep()     alloccache_calloc (&dep_cache)
     103#define free_ns(_n)     alloccache_free (&nameseq_cache, _n)
     104#define free_dep(_d)    alloccache_free (&dep_cache, _d)
     105#endif
     106
    85107struct dep *copy_dep_chain (const struct dep *d);
    86108void free_dep_chain (struct dep *d);
    87109void free_ns_chain (struct nameseq *n);
    88110struct dep *read_all_makefiles (const char **makefiles);
    89 #ifndef CONFIG_WITH_VALUE_LENGTH
    90 int eval_buffer (char *buffer);
    91 #else
    92 int eval_buffer (char *buffer, char *eos);
    93 #endif
     111void eval_buffer (char *buffer IF_WITH_VALUE_LENGTH(COMMA char *eos));
    94112int update_goal_chain (struct dep *goals);
    95 void uniquize_deps (struct dep *);
    96113
    97114#ifdef CONFIG_WITH_INCLUDEDEP
    … …  
    100117void eval_include_dep (const char *name, struct floc *f, enum incdep_op op);
    101118void incdep_flush_and_term (void);
    102 
    103 /* read.c */
    104 void record_files (struct nameseq *filenames, const char *pattern,
    105                    const char *pattern_percent, struct dep *deps,
    106                    unsigned int cmds_started, char *commands,
    107                    unsigned int commands_idx, int two_colon,
    108                    const struct floc *flocp);
    109119#endif
    110120
Note: See TracChangeset for help on using the changeset viewer.