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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/lib/mksh/dosys.cc
          +++ new/usr/src/cmd/make/lib/mksh/dosys.cc
↓ open down ↓ 28 lines elided ↑ open up ↑
  29   29   *
  30   30   *      Execute one commandline
  31   31   */
  32   32  
  33   33  /*
  34   34   * Included files
  35   35   */
  36   36  #include <sys/wait.h>                   /* WIFEXITED(status) */
  37   37  #include <alloca.h>             /* alloca() */
  38   38  
  39      -#if defined(TEAMWARE_MAKE_CMN) || defined(MAKETOOL) /* tolik */
  40      -#if defined(DISTRIBUTED)
  41      -#       include <dm/Avo_CmdOutput.h>
  42      -#       include <rw/xdrstrea.h>
  43      -#endif
  44      -#endif
  45      -
  46   39  #include <stdio.h>              /* errno */
  47   40  #include <errno.h>              /* errno */
  48   41  #include <fcntl.h>              /* open() */
  49   42  #include <mksh/dosys.h>
  50   43  #include <mksh/macro.h>         /* getvar() */
  51   44  #include <mksh/misc.h>          /* getmem(), fatal_mksh(), errmsg() */
  52   45  #include <mksdmsi18n/mksdmsi18n.h>      /* libmksdmsi18n_init() */
  53   46  #include <sys/signal.h>         /* SIG_DFL */
  54   47  #include <sys/stat.h>           /* open() */
  55   48  #include <sys/wait.h>           /* wait() */
  56   49  #include <ulimit.h>             /* ulimit() */
  57   50  #include <unistd.h>             /* close(), dup2() */
  58   51  
  59   52  
  60   53  
  61   54  /*
  62   55   * Defined macros
  63   56   */
  64      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
  65      -#define SEND_MTOOL_MSG(cmds) \
  66      -        if (send_mtool_msgs) { \
  67      -                cmds \
  68      -        }
  69      -#else
  70   57  #define SEND_MTOOL_MSG(cmds)
  71      -#endif
  72   58  
  73   59  /*
  74   60   * typedefs & structs
  75   61   */
  76   62  
  77   63  /*
  78   64   * Static variables
  79   65   */
  80   66  
  81   67  /*
↓ open down ↓ 483 lines elided ↑ open up ↑
 565  551   *              command         The command we ran, for error msgs
 566  552   *              running_pid     The pid of the process we are waiting for
 567  553   *              
 568  554   *      Static variables used:
 569  555   *              filter_file     The fd for the filter file
 570  556   *              filter_file_name The name of the filter file
 571  557   *
 572  558   *      Global variables used:
 573  559   *              filter_stderr   Set if -X is on
 574  560   */
 575      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
 576      -Boolean
 577      -await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, XDR *xdrs_p, int job_msg_id)
 578      -#else
 579  561  Boolean
 580  562  await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, void *xdrs_p, int job_msg_id)
 581      -#endif
 582  563  {
 583  564          int                     status;
 584  565          char                    *buffer;
 585  566          int                     core_dumped;
 586  567          int                     exit_status;
 587      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
 588      -        Avo_CmdOutput           *make_output_msg;
 589      -#endif
 590  568          FILE                    *outfp;
 591  569          register pid_t          pid;
 592  570          struct stat             stat_buff;
 593  571          int                     termination_signal;
 594  572          char                    tmp_buf[MAXPATHLEN];
 595      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
 596      -        RWCollectable           *xdr_msg;
 597      -#endif
 598  573  
 599  574          while ((pid = wait(&status)) != running_pid) {
 600  575                  if (pid == -1) {
 601  576                          fatal_mksh(catgets(libmksdmsi18n_catd, 1, 98, "wait() failed: %s"), errmsg(errno));
 602  577                  }
 603  578          }
 604  579          (void) fflush(stdout);
 605  580          (void) fflush(stderr);
 606  581  
 607  582          if (status == 0) {
↓ open down ↓ 155 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX