Print this page
make: unifdef for TEAMWARE_MAKE_CMN (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/include/mk/defs.h
          +++ new/usr/src/cmd/make/include/mk/defs.h
↓ open down ↓ 112 lines elided ↑ open up ↑
 113  113          struct _Property        *command;
 114  114          struct _Name            *sprodep_value;
 115  115          char                    *sprodep_env;
 116  116          int                     recursion_level;
 117  117          Boolean                 do_get;
 118  118          Boolean                 implicit;
 119  119          Boolean                 redo;
 120  120          int                     auto_count;
 121  121          struct _Name            **automatics;
 122  122          pid_t                   pid;
 123      -#ifdef TEAMWARE_MAKE_CMN
 124  123          int                     job_msg_id;
 125      -#else
 126      -        int                     host;
 127      -#endif
 128  124          char                    *stdout_file;
 129  125          char                    *stderr_file;
 130  126          struct _Name            *temp_file;
 131  127          int                     conditional_cnt;
 132  128          struct _Name            **conditional_targets;
 133      -#ifdef TEAMWARE_MAKE_CMN
 134  129          Boolean                 make_refd;
 135      -#endif
 136  130  };
 137  131  
 138  132  typedef enum {
 139  133          serial_mode,
 140  134          parallel_mode,
 141  135          distributed_mode
 142  136  } DMake_mode;
 143  137  
 144  138  typedef enum {
 145  139          txt1_mode,
↓ open down ↓ 75 lines elided ↑ open up ↑
 221  215  extern  Boolean         fatal_in_progress;
 222  216  extern  int             file_number;
 223  217  extern  Name            force;
 224  218  extern  Name            ignore_name;
 225  219  extern  Boolean         ignore_errors;
 226  220  extern  Boolean         ignore_errors_all;
 227  221  extern  Name            init;
 228  222  extern  int             job_msg_id;
 229  223  extern  Boolean         keep_state;
 230  224  extern  Name            make_state;
 231      -#ifdef TEAMWARE_MAKE_CMN
 232  225  extern  timestruc_t     make_state_before;
 233      -#endif
 234  226  extern  Boolean         make_state_locked;
 235  227  extern  Dependency      makefiles_used;
 236  228  extern  Name            makeflags;
 237  229  extern  Name            make_version;
 238  230  extern  char            mbs_buffer2[];
 239  231  extern  char            *mbs_ptr;
 240  232  extern  char            *mbs_ptr2;
 241  233  extern  Boolean         no_action_was_taken;
 242  234  extern  int             mtool_msgs_fd;
 243  235  extern  Boolean         no_parallel;
↓ open down ↓ 70 lines elided ↑ open up ↑
 314  306  extern  int             file_lock(char *, char *, int *, int);
 315  307  
 316  308  /*
 317  309   * Declarations of functions declared and used by make
 318  310   */
 319  311  extern  void            add_pending(Name target, int recursion_level, Boolean do_get, Boolean implicit, Boolean redo);
 320  312  extern  void            add_running(Name target, Name true_target, Property command, int recursion_level, int auto_count, Name *automatics, Boolean do_get, Boolean implicit);
 321  313  extern  void            add_serial(Name target, int recursion_level, Boolean do_get, Boolean implicit);
 322  314  extern  void            add_subtree(Name target, int recursion_level, Boolean do_get, Boolean implicit);
 323  315  extern  void            append_or_replace_macro_in_dyn_array(ASCII_Dyn_Array *Ar, char *macro);
 324      -#ifdef TEAMWARE_MAKE_CMN
 325  316  extern  void            await_parallel(Boolean waitflg);
 326      -#endif
 327  317  extern  void            build_suffix_list(Name target_suffix);
 328  318  extern  Boolean         check_auto_dependencies(Name target, int auto_count, Name *automatics);
 329  319  extern  void            check_state(Name temp_file_name);
 330  320  extern  void            cond_macros_into_string(Name np, String_rec *buffer);
 331  321  extern  void            construct_target_string();
 332  322  extern  void            create_xdrs_ptr(void);
 333  323  extern  void            depvar_add_to_list (Name name, Boolean cmdline);
 334  324  extern  Doname          doname(register Name target, register Boolean do_get, register Boolean implicit, register Boolean automatic = false);
 335  325  extern  Doname          doname_check(register Name target, register Boolean do_get, register Boolean implicit, register Boolean automatic);
 336  326  extern  Doname          doname_parallel(Name target, Boolean do_get, Boolean implicit);
↓ open down ↓ 74 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX