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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/read.cc
          +++ new/usr/src/cmd/make/bin/read.cc
↓ open down ↓ 34 lines elided ↑ open up ↑
  35   35  #include <avo/avo_alloca.h>             /* alloca() */
  36   36  #include <errno.h>              /* errno */
  37   37  #include <fcntl.h>              /* fcntl() */
  38   38  #include <mk/defs.h>
  39   39  #include <mksh/macro.h>         /* expand_value(), expand_macro() */
  40   40  #include <mksh/misc.h>          /* getmem() */
  41   41  #include <mksh/read.h>          /* get_next_block_fn() */
  42   42  #include <sys/uio.h>            /* read() */
  43   43  #include <unistd.h>             /* read(), unlink() */
  44   44  
  45      -#if defined(HP_UX) || defined(linux)
  46      -#include <avo/types.h>
  47      -extern "C" Avo_err *avo_find_run_dir(char **dirp);
  48      -#endif
  49   45  
  50   46  /*
  51   47   * typedefs & structs
  52   48   */
  53   49  
  54   50  /*
  55   51   * Static variables
  56   52   */
  57   53  
  58   54  static int line_started_with_space=0; // Used to diagnose spaces instead of tabs
↓ open down ↓ 51 lines elided ↑ open up ↑
 110  106          register int            length;
 111  107          wchar_t                 *previous_file_being_read = file_being_read;
 112  108          int                     previous_line_number = line_number;
 113  109          wchar_t                 previous_current_makefile[MAXPATHLEN];
 114  110          Makefile_type           save_makefile_type;
 115  111          Name                    normalized_makefile_name;
 116  112          register wchar_t        *string_start;
 117  113          register wchar_t        *string_end;
 118  114  
 119  115  
 120      -#if defined(HP_UX) || defined(linux)
 121      -        Avo_err                 *findrundir_err;
 122      -        char                    *run_dir, makerules_dir[BUFSIZ];
 123      -#endif
 124  116  
 125  117          wchar_t * wcb = get_wstring(makefile_name->string_mb);
 126  118  
 127  119  #ifdef NSE
 128  120          if (report_file){
 129  121                  wscpy(previous_current_makefile, current_makefile);
 130  122                  wscpy(current_makefile, wcb);
 131  123          }
 132  124  #endif 
 133  125          if (max_include_depth++ >= 40) {
↓ open down ↓ 2020 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX