make: unifdef for MAKETOOL and DISTRIBUTED (undefined)

          --- old/usr/src/cmd/make/include/mksh/dosys.h
          +++ new/usr/src/cmd/make/include/mksh/dosys.h

   1    1  #ifndef _MKSH_DOSYS_H
   2    2  #define _MKSH_DOSYS_H
   3    3  /*
   4    4   * CDDL HEADER START
   5    5   *
   6    6   * The contents of this file are subject to the terms of the
   7    7   * Common Development and Distribution License (the "License").
   8    8   * You may not use this file except in compliance with the License.
   9    9   *
  10   10   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  11   11   * or http://www.opensolaris.org/os/licensing.
  12   12   * See the License for the specific language governing permissions
  13   13   * and limitations under the License.
  14   14   *
  15   15   * When distributing Covered Code, include this CDDL HEADER in each
  16   16   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  17   17   * If applicable, add the following below this CDDL HEADER, with the
  18   18   * fields enclosed by brackets "[]" replaced with your own identifying

  19   19   * information: Portions Copyright [yyyy] [name of copyright owner]
  20   20   *
  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  #include <mksh/defs.h>
  29      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
  30      -#       include <rw/xdrstrea.h>
  31      -#endif
  32   29  #include <vroot/vroot.h>
  33   30  
  34      -#if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
  35      -extern Boolean  await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, XDR *xdrs, int job_msg_id);
  36      -#else
  37   31  extern Boolean  await(register Boolean ignore_error, register Boolean silent_error, Name target, wchar_t *command, pid_t running_pid, Boolean send_mtool_msgs, void *xdrs, int job_msg_id);
  38      -#endif
  39   32  extern int      doexec(register wchar_t *command, register Boolean ignore_error, Boolean redirect_out_err, char *stdout_file, char *stderr_file, pathpt vroot_path, int nice_prio);
  40   33  extern int      doshell(wchar_t *command, register Boolean ignore_error, Boolean redirect_out_err, char *stdout_file, char *stderr_file, int nice_prio);
  41   34  extern Doname   dosys_mksh(register Name command, register Boolean ignore_error, register Boolean call_make, Boolean silent_error, Boolean always_exec, Name target, Boolean redirect_out_err, char *stdout_file, char *stderr_file, pathpt vroot_path, int nice_prio);
  42   35  extern void     redirect_io(char *stdout_file, char *stderr_file);
  43   36  extern void     sh_command2string(register String command, register String destination);
  44   37  
  45   38  #endif
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX