Print this page
make: unifdef for other OSes (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/misc.cc
          +++ new/usr/src/cmd/make/bin/misc.cc
↓ open down ↓ 38 lines elided ↑ open up ↑
  39   39  /*
  40   40   * Included files
  41   41   */
  42   42  #include <errno.h>
  43   43  #include <mk/defs.h>
  44   44  #include <mksh/macro.h>         /* SETVAR() */
  45   45  #include <mksh/misc.h>          /* enable_interrupt() */
  46   46  #include <stdarg.h>             /* va_list, va_start(), va_end() */
  47   47  #include <vroot/report.h>       /* SUNPRO_DEPENDENCIES */
  48   48  
  49      -#if defined(HP_UX) || defined(linux)
  50      -#include <unistd.h>
  51      -#endif
  52   49  
  53   50  #ifdef TEAMWARE_MAKE_CMN
  54   51  #define MAXJOBS_ADJUST_RFE4694000
  55   52  
  56   53  #ifdef MAXJOBS_ADJUST_RFE4694000
  57   54  extern void job_adjust_fini();
  58   55  #endif /* MAXJOBS_ADJUST_RFE4694000 */
  59   56  #endif /* TEAMWARE_MAKE_CMN */
  60   57  
  61      -#if defined(linux)
  62      -#include <time.h>               /* localtime() */
  63      -#endif
  64   58  
  65   59  /*
  66   60   * Defined macros
  67   61   */
  68   62  
  69   63  /*
  70   64   * typedefs & structs
  71   65   */
  72   66  
  73   67  /*
↓ open down ↓ 642 lines elided ↑ open up ↑
 716  710          get_name->special_reader = get_special;
 717  711          get_posix_name->special_reader = get_posix_special;
 718  712          silent_name->special_reader = silent_special;
 719  713          suffixes_name->special_reader = suffixes_special;
 720  714  
 721  715          /* The value of $$ is $ */
 722  716          (void) SETVAR(dollar, dollar, false);
 723  717          dollar->dollar = false;
 724  718  
 725  719          /* Set the value of $(SHELL) */
 726      -        #ifdef HP_UX
 727      -        MBSTOWCS(wcs_buffer, NOCATGETS("/bin/posix/sh"));
 728      -        #else
 729  720          if (posix) {
 730  721            MBSTOWCS(wcs_buffer, NOCATGETS("/usr/xpg4/bin/sh"));
 731  722          } else {
 732  723            MBSTOWCS(wcs_buffer, NOCATGETS("/bin/sh"));
 733  724          }
 734      -        #endif
 735  725          (void) SETVAR(shell_name, GETNAME(wcs_buffer, FIND_LENGTH), false);
 736  726  
 737  727          /*
 738  728           * Use " FORCE" to simulate a FRC dependency for :: type
 739  729           * targets with no dependencies.
 740  730           */
 741  731          (void) append_prop(force, line_prop);
 742  732          force->stat.time = file_max_time;
 743  733  
 744  734          /* Make sure VPATH is defined before current dir is read */
↓ open down ↓ 246 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX