Changeset 1975 for trunk/src/kmk/file.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/file.c (modified) (5 diffs)

trunk/src/kmk/file.c

@@ -83 +83 @@
 */
 
-#ifndef KMK
+#ifndef CONFIG_WITH_STRCACHE2
 struct file *
 lookup_file (const char *name)
-#else  /* KMK */
+#else  /* CONFIG_WITH_STRCACHE2 */
 MY_INLINE struct file *
 lookup_file_common (const char *name, int cached)
-#endif /* KMK */
+#endif /* CONFIG_WITH_STRCACHE2 */
 {
   struct file *f;
@@ -164 +164 @@
 }
 
-#ifdef KMK
+#ifdef CONFIG_WITH_STRCACHE2
 /* Given a name, return the struct file * for that name,
   or nil if there is none. */
@@ -182 +182 @@
   return lookup_file_common (name, 1 /* cached */);
 }
-#endif /* KMK */
+#endif /* CONFIG_WITH_STRCACHE2 */
 
 
@@ -582 +582 @@
       struct dep *new, *d1;
       char *p;
-#ifdef CONFIG_WITH_VALUE_LENGTH
+#ifdef CONFIG_WITH_STRCACHE2
       unsigned int len;
 #endif
@@ -669 +669 @@
           set_file_variables (f);
 
-#ifndef CONFIG_WITH_STRCACHE2
+#if !defined (CONFIG_WITH_VALUE_LENGTH) || !defined (CONFIG_WITH_STRCACHE2)
           p = variable_expand_for_file (d->name, f);
 #else