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

*** 60,72 ****
  extern  Name            normalize_name(register wchar_t *name_string, register int length);
  
  // From parallel.cc
  #define MAXJOBS_ADJUST_RFE4694000
  
- #ifdef MAXJOBS_ADJUST_RFE4694000
  extern void job_adjust_fini();
- #endif /* MAXJOBS_ADJUST_RFE4694000 */
  
  
  /*
   * Defined macros
   */
--- 60,70 ----
*** 713,725 ****
                  make_state_locked = false;
          }
          /* Write .make.state */
          write_state_file(1, (Boolean) 1);
  
- #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
          job_adjust_fini();
- #endif
  }
  
  /*
   *      handle_interrupt()
   *
--- 711,721 ----
*** 1162,1177 ****
                      (strchr(cp, (int) equal_char) != NULL)) {
  
                          /* New MAKEFLAGS format */
  
                          add_hyphen = false;
! #ifdef ADDFIX5060758                    
                          /* Check if MAKEFLAGS value begins with multiple
                           * hyphen characters, and remove all duplicates.
                           * Usually it happens when the next command is
                           * used: $(MAKE) -$(MAKEFLAGS)
!                          * This is a workaround for BugID 5060758.
                           */
                          while (*cp) {
                                  if (*cp != (int) hyphen_char) {
                                          break;
                                  }
--- 1158,1175 ----
                      (strchr(cp, (int) equal_char) != NULL)) {
  
                          /* New MAKEFLAGS format */
  
                          add_hyphen = false;
! 
                          /* Check if MAKEFLAGS value begins with multiple
                           * hyphen characters, and remove all duplicates.
                           * Usually it happens when the next command is
                           * used: $(MAKE) -$(MAKEFLAGS)
!                          * 
!                          * This was a workaround for BugID 5060758, but
!                          * appears to have survived as a fix in make.
                           */
                          while (*cp) {
                                  if (*cp != (int) hyphen_char) {
                                          break;
                                  }
*** 1185,1195 ****
                                          /* There are hyphens only. Skip all */
                                          cp_orig = cp;
                                          break;
                                  }
                          }
- #endif
                  } else {
  
                          /* Old MAKEFLAGS format */
  
                          add_hyphen = true;
--- 1183,1192 ----