make: unifdef for TEAMWARE_MAKE_CMN (defined)

@@ -21,11 +21,10 @@
 /*
  * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
  * Use is subject to license terms.
  */
 
-#ifdef TEAMWARE_MAKE_CMN
 
 /*
  *      parallel.cc
  *
  *      Deal with the parallel processing

@@ -67,15 +66,13 @@
 
 
 /*
  * Static variables
  */
-#ifdef TEAMWARE_MAKE_CMN
 static  Boolean         just_did_subtree = false;
 static  char            local_host[MAXNAMELEN] = "";
 static  char            user_name[MAXNAMELEN] = "";
-#endif
 static  int             pmake_max_jobs = 0;
 static  pid_t           process_running = -1;
 static  Running         *running_tail = &running_list;
 static  Name            subtree_conflict;
 static  Name            subtree_conflict2;

@@ -259,11 +256,10 @@
                 return res;
         }
 }
 
 
-#ifdef TEAMWARE_MAKE_CMN
 #define MAXJOBS_ADJUST_RFE4694000
 
 #ifdef MAXJOBS_ADJUST_RFE4694000
 
 #include <unistd.h>     /* sysconf(_SC_NPROCESSORS_ONLN) */

@@ -549,11 +545,10 @@
                 }
         }
 }
 
 #endif /* MAXJOBS_ADJUST_RFE4694000 */
-#endif /* TEAMWARE_MAKE_CMN */
 
 /*
  *      distribute_process(char **commands, Property line)
  *
  *      Parameters:

@@ -669,11 +664,11 @@
 
         mktemp(mbstring);
 
         stdout_file = strdup(mbstring);
         stderr_file = NULL;
-#if defined (TEAMWARE_MAKE_CMN)
+
         if (!out_err_same) {
                 (void) sprintf(mbstring,
                                 NOCATGETS("%s/dmake.stderr.%d.%d.XXXXXX"),
                                 tmpdir,
                                 getpid(),

@@ -681,11 +676,10 @@
 
                 mktemp(mbstring);
 
                 stderr_file = strdup(mbstring);
         }
-#endif
 
         process_running = run_rule_commands(local_host, commands);
 
         return build_running;
 }

@@ -1925,7 +1919,6 @@
         }
         retmem_mb((char *) rp);
 
 }
 
-#endif