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

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/dist.cc
          +++ new/usr/src/cmd/make/bin/dist.cc
↓ open down ↓ 34 lines elided ↑ open up ↑
  35   35  #include <avo/util.h>
  36   36  #include <dm/Avo_AcknowledgeMsg.h>
  37   37  #include <dm/Avo_DoJobMsg.h>
  38   38  #include <dm/Avo_JobResultMsg.h>
  39   39  #include <mk/defs.h>
  40   40  #include <mksh/misc.h>          /* getmem() */
  41   41  #include <rw/pstream.h>
  42   42  #include <rw/queuecol.h>
  43   43  #include <rw/xdrstrea.h>
  44   44  #include <signal.h>
  45      -#ifdef linux
  46      -#include <sstream>
  47      -using namespace std;
  48      -#else
  49   45  #include <strstream.h>
  50      -#endif
  51   46  #include <sys/stat.h>           /* stat() */
  52   47  #include <sys/types.h>
  53   48  #include <sys/wait.h>
  54   49  #include <unistd.h>
  55   50  #include <errno.h>
  56   51  
  57   52  /*
  58   53   * Defined macros
  59   54   */
  60   55  
↓ open down ↓ 196 lines elided ↑ open up ↑
 257  252                          env = getmem(length);
 258  253                          (void) sprintf(env,
 259  254                                         "%s=",
 260  255                                         NOCATGETS("DMAKE_ODIR"));
 261  256                          (void) putenv(env);
 262  257                  }
 263  258  
 264  259                  (void) sprintf(&rxm_command[strlen(rxm_command)],
 265  260                                 NOCATGETS(" %d %d"),
 266  261                                 pipe1[0], pipe2[1]);
 267      -#ifdef linux
 268      -                execl(NOCATGETS("/bin/sh"),
 269      -#else
 270  262                  execl(NOCATGETS("/usr/bin/sh"),
 271      -#endif
 272  263                        NOCATGETS("sh"),
 273  264                        NOCATGETS("-c"),
 274  265                        rxm_command,
 275  266                        (char *)NULL);
 276  267                  _exit(127);
 277  268          }
 278  269  }
 279  270  
 280  271  /*
 281  272   * static void
↓ open down ↓ 295 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX