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

@@ -60,13 +60,11 @@
 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
  */

@@ -713,13 +711,11 @@
                 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()
  *

@@ -1162,16 +1158,18 @@
                     (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.
+                         * 
+                         * 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,11 +1183,10 @@
                                         /* There are hyphens only. Skip all */
                                         cp_orig = cp;
                                         break;
                                 }
                         }
-#endif
                 } else {
 
                         /* Old MAKEFLAGS format */
 
                         add_hyphen = true;