Changeset 1975 in kBuild for trunk/src/kmk

Timestamp:

Oct 26, 2008 10:48:35 PM (16 years ago)

Author:

bird

Message:

kmk: cleaning up some CONFIG_WITH_STRCACHE2 mess.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (2 diffs)
• file.c (modified) (5 diffs)
• filedef.h (modified) (1 diff)
• make.h (modified) (1 diff)
• read.c (modified) (4 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -831 +831 @@
 
 
-#ifdef CONFIG_WITH_COMMANDS_FUNC
+#if defined (CONFIG_WITH_VALUE_LENGTH) || defined (CONFIG_WITH_COMMANDS_FUNC)
 /* Expand LINE for FILE.  Error messages refer to the file and line where
    FILE's commands were found.  Expansion uses FILE's variable set list.
@@ -875 +875 @@
 
 
-#endif /* CONFIG_WITH_COMMANDS_FUNC */
+#endif /* CONFIG_WITH_VALUE_LENGTH || CONFIG_WITH_COMMANDS_FUNC */
 /* Like allocated_variable_expand, but for += target-specific variables.
    First recursively construct the variable value from its appended parts in

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

trunk/src/kmk/filedef.h

@@ -126 +126 @@
 
 struct file *lookup_file (const char *name);
-#ifdef KMK
+#ifdef CONFIG_WITH_STRCACHE2
 struct file *lookup_file_cached (const char *name);
 #endif

trunk/src/kmk/make.h

@@ -165 +165 @@
 #endif
 
-#if defined (KMK) || defined (CONFIG_WITH_VALUE_LENGTH)
+#if defined (KMK) || defined (CONFIG_WITH_VALUE_LENGTH) \
+ || defined (CONFIG_WITH_STRCACHE2)
 # ifdef _MSC_VER
 #  define MY_DBGBREAK   __debugbreak()

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

trunk/src/kmk/variable.h

@@ -184 +184 @@
 char *variable_expand (const char *line);
 char *variable_expand_for_file (const char *line, struct file *file);
-#ifdef CONFIG_WITH_COMMANDS_FUNC
+#if defined (CONFIG_WITH_VALUE_LENGTH) || defined (CONFIG_WITH_COMMANDS_FUNC)
 char *variable_expand_for_file_2 (char *o, const char *line, unsigned int lenght,
                                   struct file *file, unsigned int *value_lenp);