Print this page
make: unifdef SUN5_0 (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/files.cc
          +++ new/usr/src/cmd/make/bin/files.cc
↓ open down ↓ 28 lines elided ↑ open up ↑
  29   29   *      Various file related routines:
  30   30   *              Figure out if file exists
  31   31   *              Wildcard resolution for directory reader
  32   32   *              Directory reader
  33   33   */
  34   34  
  35   35  
  36   36  /*
  37   37   * Included files
  38   38   */
  39      -#if defined(SUN5_0) || defined(HP_UX)
  40   39  #include <dirent.h>             /* opendir() */
  41      -#else
  42      -#include <sys/dir.h>            /* opendir() */
  43      -#endif
  44   40  #include <errno.h>              /* errno */
  45   41  #include <mk/defs.h>
  46   42  #include <mksh/macro.h>         /* getvar() */
  47   43  #include <mksh/misc.h>          /* get_prop(), append_prop() */
  48   44  #include <sys/stat.h>           /* lstat() */
  49   45  
  50   46  /*
  51   47   * Defined macros
  52   48   */
  53   49  
↓ open down ↓ 245 lines elided ↑ open up ↑
 299  295  {
 300  296          wchar_t                 file_name[MAXPATHLEN];
 301  297          wchar_t                 *file_name_p = file_name;
 302  298          Name                    file;
 303  299          wchar_t                 plain_file_name[MAXPATHLEN];
 304  300          wchar_t                 *plain_file_name_p;
 305  301          Name                    plain_file;
 306  302          wchar_t                 tmp_wcs_buffer[MAXPATHLEN];
 307  303          DIR                     *dir_fd;
 308  304          int                     m_local_dependency=0;
 309      -#if defined(SUN5_0) || defined(HP_UX)
 310  305  #define d_fileno d_ino
 311  306          register struct dirent  *dp;
 312      -#else
 313      -        register struct direct  *dp;
 314      -#endif
 315  307          wchar_t                 *vpath = NULL;
 316  308          wchar_t                 *p;
 317  309          int                     result = 0;
 318  310  
 319  311          if(dir->hash.length >= MAXPATHLEN) {
 320  312                  return 0;
 321  313          }
 322  314  
 323  315          Wstring wcb(dir);
 324  316          Wstring vps;
↓ open down ↓ 404 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX