Print this page
make: unifdef for TEAMWARE_MAKE_CMN (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 ↓ 17 lines elided ↑ open up ↑
  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      -/*
  29      - * This is not "#ifdef TEAMWARE_MAKE_CMN" because we're currently
  30      - * using the TW fake i18n headers and libraries to build both
  31      - * SMake and PMake on SPARC/S1 and x86/S2.
  32      - */
  33      -
  34   28  #include <avo/intl.h>
  35   29  #include <limits.h>             /* MB_LEN_MAX */
  36   30  #include <stdio.h>
  37   31  #include <stdlib.h>             /* wchar_t */
  38   32  #include <string.h>             /* strcmp() */
  39   33  #include <nl_types.h>           /* catgets() */
  40   34  #include <sys/param.h>          /* MAXPATHLEN */
  41   35  #include <sys/types.h>          /* time_t, caddr_t */
  42   36  #include <vroot/vroot.h>        /* pathpt */
  43   37  #include <sys/time.h>           /* timestruc_t */
↓ open down ↓ 851 lines elided ↑ open up ↑
 895  889  extern Boolean          svr4;
 896  890  extern Name             target_arch;
 897  891  extern Name             target_mach;
 898  892  extern Boolean          tilde_rule;
 899  893  extern wchar_t          wcs_buffer[];
 900  894  extern Boolean          working_on_targets;
 901  895  extern Name             virtual_root;
 902  896  extern Boolean          vpath_defined;
 903  897  extern Name             vpath_name;
 904  898  extern Boolean          make_state_locked;
 905      -#if defined (TEAMWARE_MAKE_CMN)
 906  899  extern Boolean          out_err_same;
 907      -#endif
 908  900  extern pid_t            childPid;
 909  901  extern nl_catd          libmksh_catd;
 910  902  
 911  903  /*
 912  904   * RFE 1257407: make does not use fine granularity time info available from stat.
 913  905   * High resolution time comparison.
 914  906   */
 915  907  
 916  908  inline int
 917  909  operator==(const timestruc_t &t1, const timestruc_t &t2) {
↓ open down ↓ 41 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX