Changeset 1975 for trunk/src/kmk/read.c

Timestamp:

Oct 26, 2008, 11:48:35 PM (17 years ago)

Author:

bird

Message:

kmk: cleaning up some CONFIG_WITH_STRCACHE2 mess.

File:

• trunk/src/kmk/read.c (modified) (4 diffs)

trunk/src/kmk/read.c

@@ -445 +445 @@
   deps->next = read_makefiles;
   read_makefiles = deps;
-#ifndef KMK
+#ifndef CONFIG_WITH_STRCACHE2
   deps->file = lookup_file (filename);
 #else
@@ -2407 +2407 @@
              new entry if the file is a double-colon, which we don't want in
              this situation.  */
-#ifndef KMK
+#ifndef CONFIG_WITH_STRCACHE2
           f = lookup_file (name);
           if (!f)
             f = enter_file (strcache_add (name));
-#else  /* KMK */
+#else  /* CONFIG_WITH_STRCACHE2 */
            /* XXX: this is probably already a cached string. */
           fname = strcache_add (name);
@@ -2417 +2417 @@
           if (!f)
             f = enter_file (fname);
-#endif
+#endif /* CONFIG_WITH_STRCACHE2 */
           else if (f->double_colon)
             f = f->double_colon;
@@ -2780 +2780 @@
         {
           /* Double-colon.  Make a new record even if there already is one.  */
-#ifndef KMK
+#ifndef CONFIG_WITH_STRCACHE2
           f = lookup_file (name);
-#else  /* KMK - the name is already in the cache, don't waste time.  */
+#else  /* CONFIG_WITH_STRCACHE2 - the name is already in the cache, don't waste time.  */
           f = lookup_file_cached (name);
-#endif
+#endif /* CONFIG_WITH_STRCACHE2 */
 
           /* Check for both : and :: rules.  Check is_target so