Print this page
make: unifdef SUN5_0 (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/lib/vroot/lock.cc
          +++ new/usr/src/cmd/make/lib/vroot/lock.cc
↓ open down ↓ 123 lines elided ↑ open up ↑
 124  124                          if (r == -1) {
 125  125                                  /*
 126  126                                   * The lock must have just gone away - try 
 127  127                                   * again.
 128  128                                   */
 129  129                                  break;
 130  130                          }
 131  131  
 132  132                          if ((counter > 5) && (!printed_warning)) {
 133  133                                  /* Print waiting message after 5 secs */
 134      -#if defined(SUN5_0) || defined(HP_UX) || defined(linux)
 135  134                                  (void) getcwd(msg, MAXPATHLEN);
 136      -#else
 137      -                                (void) getwd(msg);
 138      -#endif
 139  135                                  fprintf(stderr,
 140  136                                          catgets(libmksdmsi18n_catd, 1, 162, "file_lock: file %s is already locked.\n"),
 141  137                                          name);
 142  138                                  fprintf(stderr,
 143  139                                          catgets(libmksdmsi18n_catd, 1, 163, "file_lock: will periodically check the lockfile %s for two minutes.\n"),
 144  140                                          lockname);
 145  141                                  fprintf(stderr,
 146  142                                          catgets(libmksdmsi18n_catd, 1, 144, "Current working directory %s\n"),
 147  143                                          msg);
 148  144  
↓ open down ↓ 21 lines elided ↑ open up ↑
 170  166  
 171  167          sprintf(msg, catgets(libmksdmsi18n_catd, 1, 145, "Could not lock file `%s'; "), file);
 172  168          len = strlen(msg);
 173  169          sprintf(&msg[len], str, arg1, arg2);
 174  170          strcat(msg, catgets(libmksdmsi18n_catd, 1, 146, " failed - "));
 175  171  #if !defined(linux)
 176  172          if (errno < sys_nerr) {
 177  173  #ifdef SUN4_x
 178  174                  strcat(msg, sys_errlist[errno]);
 179  175  #endif
 180      -#ifdef SUN5_0
 181  176                  strcat(msg, strerror(errno));
 182      -#endif
 183  177          } else {
 184  178                  len = strlen(msg);
 185  179                  sprintf(&msg[len], NOCATGETS("errno %d"), errno);
 186  180          }
 187  181  #else
 188  182          strcat(msg, strerror(errno));
 189  183  #endif
 190  184  }
 191  185  
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX