Print this page
make: unifdef for REDIRECT_ERR (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/include/mksh/defs.h
          +++ new/usr/src/cmd/make/include/mksh/defs.h
↓ open down ↓ 403 lines elided ↑ open up ↑
 404  404          struct _Name            *value;
 405  405          Boolean                 exported:1;
 406  406          Boolean                 read_only:1;
 407  407          /*
 408  408          * This macro is defined conditionally
 409  409          */
 410  410          Boolean                 is_conditional:1;
 411  411          /*
 412  412          * The list for $? is stored as a structured list that
 413  413          * is translated into a string iff it is referenced.
 414      -        * This is why  some macro values need a daemon. 
      414 +        * This is why  some macro values need a daemon.
 415  415          */
 416  416          Daemon                  daemon:2;
 417  417  };
 418  418  
 419  419  struct _Macro_list {
 420  420          struct _Macro_list      *next;
 421      -        char                    *macro_name; 
 422      -        char                    *value; 
      421 +        char                    *macro_name;
      422 +        char                    *value;
 423  423  };
 424  424  
 425  425  enum sccs_stat {
 426  426          DONT_KNOW_SCCS = 0,
 427  427          NO_SCCS,
 428  428          HAS_SCCS
 429  429  };
 430  430  
 431  431  struct _Name {
 432  432          struct _Property        *prop;          /* List of properties */
↓ open down ↓ 21 lines elided ↑ open up ↑
 454  454           */
 455  455          short                   temp_file_number;
 456  456          /*
 457  457           * Count how many conditional macros this target has defined
 458  458           */
 459  459          short                   conditional_cnt;
 460  460          /*
 461  461           * A conditional macro was used when building this target
 462  462           */
 463  463          Boolean                 depends_on_conditional:1;
 464      -        /* 
 465      -         * Pointer to list of conditional macros which were used to build 
      464 +        /*
      465 +         * Pointer to list of conditional macros which were used to build
 466  466           * this target
 467  467           */
 468  468          struct _Macro_list      *conditional_macro_list;
 469  469          Boolean                 has_member_depe:1;
 470  470          Boolean                 is_member:1;
 471  471          /*
 472  472           * This target is a directory that has been read
 473  473           */
 474  474          Boolean                 has_read_dir:1;
 475  475          /*
↓ open down ↓ 217 lines elided ↑ open up ↑
 693  693          struct _Env_mem         env_mem;
 694  694  };
 695  695  
 696  696  #define PROPERTY_HEAD_SIZE (sizeof (struct _Property)-sizeof (union Body))
 697  697  struct _Property {
 698  698          struct _Property        *next;
 699  699          Property_id             type:4;
 700  700          union Body              body;
 701  701  };
 702  702  
 703      -/* Structure for dynamic "ascii" arrays */ 
      703 +/* Structure for dynamic "ascii" arrays */
 704  704  struct ASCII_Dyn_Array {
 705  705          char                    *start;
 706  706          size_t                  size;
 707  707  };
 708  708  
 709  709  struct _Envvar {
 710  710          struct _Name            *name;
 711  711          struct _Name            *value;
 712  712          struct _Envvar          *next;
 713  713          char                    *env_string;
↓ open down ↓ 60 lines elided ↑ open up ↑
 774  774  typedef struct _Source          *Source, Source_rec;
 775  775  typedef struct _String          *String, String_rec;
 776  776  
 777  777  /*
 778  778   * name records hash table.
 779  779   */
 780  780  struct Name_set {
 781  781  private:
 782  782          // single node in a tree
 783  783          struct entry {
 784      -                entry(Name name_, entry *parent_) : 
      784 +                entry(Name name_, entry *parent_) :
 785  785                          name(name_),
 786  786                          parent(parent_),
 787  787                          left(0),
 788  788                          right(0),
 789  789                          depth(1)
 790  790                  {}
 791  791  
 792  792                  Name            name;
 793  793  
 794  794                  entry           *parent;
↓ open down ↓ 100 lines elided ↑ open up ↑
 895  895  extern Boolean          svr4;
 896  896  extern Name             target_arch;
 897  897  extern Name             target_mach;
 898  898  extern Boolean          tilde_rule;
 899  899  extern wchar_t          wcs_buffer[];
 900  900  extern Boolean          working_on_targets;
 901  901  extern Name             virtual_root;
 902  902  extern Boolean          vpath_defined;
 903  903  extern Name             vpath_name;
 904  904  extern Boolean          make_state_locked;
 905      -#if defined (TEAMWARE_MAKE_CMN) && defined(REDIRECT_ERR)
      905 +#if defined (TEAMWARE_MAKE_CMN)
 906  906  extern Boolean          out_err_same;
 907  907  #endif
 908  908  extern pid_t            childPid;
 909  909  extern nl_catd          libmksh_catd;
 910  910  
 911  911  /*
 912  912   * RFE 1257407: make does not use fine granularity time info available from stat.
 913  913   * High resolution time comparison.
 914  914   */
 915  915  
↓ open down ↓ 43 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX