Print this page
make: unifdef for MAKETOOL and DISTRIBUTED (undefined)

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 ↓ 20 lines elided ↑ open up ↑
  21   21   * CDDL HEADER END
  22   22   */
  23   23  /*
  24   24   * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
  25   25   * Use is subject to license terms.
  26   26   */
  27   27  
  28   28  /*
  29   29   * Included files
  30   30   */
  31      -#ifdef DISTRIBUTED
  32      -#       include <dm/Avo_AcknowledgeMsg.h>
  33      -#       include <dm/Avo_DoJobMsg.h>
  34      -#       include <dm/Avo_JobResultMsg.h>
  35      -#endif
  36   31  
  37   32  #include <mksh/defs.h>
  38   33  
  39      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
  40      -#       include <rw/xdrstrea.h>
  41      -#endif
  42   34  
  43   35  
  44   36  /*
  45   37   * Defined macros
  46   38   */
  47   39  
  48   40  #define SKIPSPACE(x)    while (*x &&                            \
  49   41                                 ((*x == (int) space_char) ||     \
  50   42                                  (*x == (int) tab_char) ||       \
  51   43                                  (*x == (int) comma_char))) {    \
↓ open down ↓ 139 lines elided ↑ open up ↑
 191  183   *      extern declarations for all global variables.
 192  184   *      The actual declarations are in globals.cc
 193  185   */
 194  186  extern  Boolean         allrules_read;
 195  187  extern  Name            posix_name;
 196  188  extern  Name            svr4_name;
 197  189  extern  Boolean         sdot_target;
 198  190  extern  Boolean         all_parallel;
 199  191  extern  Boolean         assign_done;
 200  192  extern  Boolean         build_failed_seen;
 201      -#ifdef DISTRIBUTED
 202      -extern  Boolean         building_serial;
 203      -#endif
 204  193  extern  Name            built_last_make_run;
 205  194  extern  Name            c_at;
 206      -#ifdef DISTRIBUTED
 207      -extern  Boolean         called_make;
 208      -#endif
 209  195  extern  Boolean         command_changed;
 210  196  extern  Boolean         commands_done;
 211  197  extern  Chain           conditional_targets;
 212  198  extern  Name            conditionals;
 213  199  extern  Boolean         continue_after_error;
 214  200  extern  Property        current_line;
 215  201  extern  Name            current_make_version;
 216  202  extern  Name            current_target;
 217  203  extern  short           debug_level;
 218  204  extern  Cmd_line        default_rule;
↓ open down ↓ 109 lines elided ↑ open up ↑
 328  314  extern  int             file_lock(char *, char *, int *, int);
 329  315  
 330  316  /*
 331  317   * Declarations of functions declared and used by make
 332  318   */
 333  319  extern  void            add_pending(Name target, int recursion_level, Boolean do_get, Boolean implicit, Boolean redo);
 334  320  extern  void            add_running(Name target, Name true_target, Property command, int recursion_level, int auto_count, Name *automatics, Boolean do_get, Boolean implicit);
 335  321  extern  void            add_serial(Name target, int recursion_level, Boolean do_get, Boolean implicit);
 336  322  extern  void            add_subtree(Name target, int recursion_level, Boolean do_get, Boolean implicit);
 337  323  extern  void            append_or_replace_macro_in_dyn_array(ASCII_Dyn_Array *Ar, char *macro);
 338      -#ifdef DISTRIBUTED
 339      -extern  Doname          await_dist(Boolean waitflg);
 340      -#endif
 341  324  #ifdef TEAMWARE_MAKE_CMN
 342  325  extern  void            await_parallel(Boolean waitflg);
 343  326  #endif
 344  327  extern  void            build_suffix_list(Name target_suffix);
 345  328  extern  Boolean         check_auto_dependencies(Name target, int auto_count, Name *automatics);
 346  329  extern  void            check_state(Name temp_file_name);
 347  330  extern  void            cond_macros_into_string(Name np, String_rec *buffer);
 348  331  extern  void            construct_target_string();
 349  332  extern  void            create_xdrs_ptr(void);
 350  333  extern  void            depvar_add_to_list (Name name, Boolean cmdline);
 351      -#ifdef DISTRIBUTED
 352      -extern  void            distribute_rxm(Avo_DoJobMsg *dmake_job_msg);
 353      -extern  int             getRxmMessage(void);
 354      -extern  Avo_JobResultMsg* getJobResultMsg(void);
 355      -extern  Avo_AcknowledgeMsg* getAcknowledgeMsg(void);
 356      -#endif
 357  334  extern  Doname          doname(register Name target, register Boolean do_get, register Boolean implicit, register Boolean automatic = false);
 358  335  extern  Doname          doname_check(register Name target, register Boolean do_get, register Boolean implicit, register Boolean automatic);
 359  336  extern  Doname          doname_parallel(Name target, Boolean do_get, Boolean implicit);
 360  337  extern  Doname          dosys(register Name command, register Boolean ignore_error, register Boolean call_make, Boolean silent_error, Boolean always_exec, Name target, Boolean redirect_out_err);
 361  338  extern  void            dump_make_state(void);
 362  339  extern  void            dump_target_list(void);
 363  340  extern  void            enter_conditional(register Name target, Name name, Name value, register Boolean append);
 364  341  extern  void            enter_dependencies(register Name target, Chain target_group, register Name_vector depes, register Cmd_line command, register Separator separator);
 365  342  extern  void            enter_dependency(Property line, register Name depe, Boolean automatic);
 366  343  extern  void            enter_equal(Name name, Name value, register Boolean append);
↓ open down ↓ 12 lines elided ↑ open up ↑
 379  356  extern  int             find_run_directory (char *cmd, char *cwd, char *dir, char **pgm, char **run, char *path);
 380  357  extern  Doname          find_suffix_rule(Name target, Name target_body, Name target_suffix, Property *command, Boolean rechecking);
 381  358  extern  Chain           find_target_groups(register Name_vector target_list, register int i, Boolean reset);
 382  359  extern  void            finish_children(Boolean docheck);
 383  360  extern  void            finish_running(void);
 384  361  extern  void            free_chain(Name_vector ptr);
 385  362  extern  void            gather_recursive_deps(void);
 386  363  extern  char            *get_current_path(void);
 387  364  extern  int             get_job_msg_id(void);
 388  365  extern  FILE            *get_mtool_msgs_fp(void);
 389      -#ifdef DISTRIBUTED
 390      -extern  Boolean         get_dmake_group_specified(void);
 391      -extern  Boolean         get_dmake_max_jobs_specified(void);
 392      -extern  Boolean         get_dmake_mode_specified(void);
 393      -extern  Boolean         get_dmake_odir_specified(void);
 394      -extern  Boolean         get_dmake_rcfile_specified(void);
 395      -extern  Boolean         get_pmake_machinesfile_specified(void);
 396      -#endif
 397      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
 398      -extern  XDR             *get_xdrs_ptr(void);
 399      -#endif
 400  366  extern  wchar_t         *getmem_wc(register int size);
 401  367  /* On linux getwd(char *) is defined in 'unistd.h' */
 402  368  #ifdef __cplusplus
 403  369  extern "C" {
 404  370  #endif
 405  371  extern  char            *getwd(char *);
 406  372  #ifdef __cplusplus
 407  373  }
 408  374  #endif
 409  375  extern  void            handle_interrupt(int);
↓ open down ↓ 10 lines elided ↑ open up ↑
 420  386  extern  int             read_make_machines(Name make_machines_name);
 421  387  extern  Boolean         read_simple_file(register Name makefile_name, register Boolean chase_path, register Boolean doname_it, Boolean complain, Boolean must_exist, Boolean report_file, Boolean lock_makefile);
 422  388  extern  void            remove_recursive_dep(Name target);
 423  389  extern  void            report_recursive_dep(Name target, char *line);
 424  390  extern  void            report_recursive_done(void);
 425  391  extern  void            report_recursive_init(void);
 426  392  extern  Recursive_make  find_recursive_target(Name target);
 427  393  extern  void            reset_locals(register Name target, register Property old_locals, register Property conditional, register int index);
 428  394  extern  void            set_locals(register Name target, register Property old_locals);
 429  395  extern  void            setvar_append(register Name name, register Name value);
 430      -#ifdef DISTRIBUTED
 431      -extern  void            setvar_envvar(Avo_DoJobMsg *dmake_job_msg);
 432      -#else
 433  396  extern  void            setvar_envvar(void);
 434      -#endif
 435  397  extern  void            special_reader(Name target, register Name_vector depes, Cmd_line command);
 436  398  extern  void            startup_rxm();
 437  399  extern  Doname          target_can_be_built(register Name target);
 438  400  extern  char            *time_to_string(const timestruc_t &time);
 439  401  extern  void            update_target(Property line, Doname result);
 440  402  extern  void            warning(char *, ...);
 441  403  extern  void            write_state_file(int report_recursive, Boolean exiting);
 442  404  extern  Name            vpath_translation(register Name cmd);
 443  405  
 444  406  #define DEPINFO_FMT_VERSION "VERS2$"
 445  407  #define VER_LEN strlen(DEPINFO_FMT_VERSION)
 446  408  
 447  409  
 448  410  #endif
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX