make: unifdef for two bugfixes conditioned for unknown reasons (defined)

*** 245,257 ****
                  return res;
          }
  }
  
  
- #define MAXJOBS_ADJUST_RFE4694000
- 
- #ifdef MAXJOBS_ADJUST_RFE4694000
  
  #include <unistd.h>     /* sysconf(_SC_NPROCESSORS_ONLN) */
  #include <sys/ipc.h>            /* ftok() */
  #include <sys/shm.h>            /* shmget(), shmat(), shmdt(), shmctl() */
  #include <semaphore.h>          /* sem_init(), sem_trywait(), sem_post(), sem_destroy() */
--- 245,254 ----
*** 533,543 ****
                          }
                  }
          }
  }
  
- #endif /* MAXJOBS_ADJUST_RFE4694000 */
  
  /*
   *      distribute_process(char **commands, Property line)
   *
   *      Parameters:
--- 530,539 ----
*** 546,558 ****
   *      Return value:
   *                              The result of the execution
   *
   *      Static variables used:
   *              process_running Set to the pid of the process set running
-  * #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
   *              job_adjust_mode Current job adjust mode
-  * #endif
   */
  static Doname
  distribute_process(char **commands, Property line)
  {
          static unsigned file_number = 0;
--- 542,552 ----
*** 561,576 ****
          int             filed;
          int             res;
          int             tmp_index;
          char            *tmp_index_str_ptr;
  
- #if !defined (TEAMWARE_MAKE_CMN) || !defined (MAXJOBS_ADJUST_RFE4694000)
-         while (parallel_process_cnt >= pmake_max_jobs) {
-                 await_parallel(false);
-                 finish_children(true);
-         }
- #else /* TEAMWARE_MAKE_CMN && MAXJOBS_ADJUST_RFE4694000 */
          /* initialize adjust mode, if not initialized */
          if (job_adjust_mode == ADJUST_UNKNOWN) {
                  job_adjust_init();
          }
  
--- 555,564 ----
*** 610,620 ****
                  while (parallel_process_cnt >= pmake_max_jobs) {
                          await_parallel(false);
                          finish_children(true);
                  }
          }
! #endif /* TEAMWARE_MAKE_CMN && MAXJOBS_ADJUST_RFE4694000 */
          setvar_envvar();
          /*
           * Tell the user what DMake is doing.
           */
          if (!silent && output_mode != txt2_mode) {
--- 598,608 ----
                  while (parallel_process_cnt >= pmake_max_jobs) {
                          await_parallel(false);
                          finish_children(true);
                  }
          }
! 
          setvar_envvar();
          /*
           * Tell the user what DMake is doing.
           */
          if (!silent && output_mode != txt2_mode) {
*** 1150,1166 ****
                          rp->state = (WIFEXITED(status) && WEXITSTATUS(status) == 0) ? build_ok : build_failed;
                  }
                  nohang = true;
                  parallel_process_cnt--;
  
- #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
                  if (job_adjust_mode == ADJUST_M2) {
                          if (m2_release_job()) {
                                  job_adjust_error();
                          }
                  }
- #endif
          }
  }
  
  /*
   *      finish_children(docheck)
--- 1138,1152 ----