Changeset 520 for trunk/src/gmake/variable.c

Timestamp:

Sep 16, 2006, 6:56:25 AM (19 years ago)

Author:

bird

Message:

Cleaning up the modifications. Changes are now either configurable or marked, and dead stuff has been removed (dll shell).

File:

• trunk/src/gmake/variable.c (modified) (12 diffs)

trunk/src/gmake/variable.c

@@ -167 +167 @@
 {
   struct variable const *key = (struct variable const *) keyv;
-#ifdef VARIABLE_HASH
-#ifdef VARIABLE_HASH_STRICT
+#ifdef VARIABLE_HASH /* bird */
+# ifdef VARIABLE_HASH_STRICT
   if (key->hash1 != variable_hash_a (key->name, key->length))
     __asm__("int3");
   if (key->hash2 && key->hash2 != variable_hash_b (key->name, key->length))
     __asm__("int3");
-#endif
+# endif
   return key->hash1;
 #else
-#ifdef KMK
+# ifdef KMK
   return variable_hash_a (key->name, key->length);
-#else
+# else
   return_STRING_N_HASH_1 (key->name, key->length);
-#endif
+# endif
 #endif
 }
@@ -187 +187 @@
 variable_hash_2 (const void *keyv)
 {
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   struct variable *key = (struct variable *) keyv;
   if (!key->hash2)
@@ -194 +194 @@
 #else
   struct variable const *key = (struct variable const *) keyv;
-#ifdef KMK
+# ifdef KMK
   return variable_hash_b (key->name, key->length);
-#else
+# else
   return_STRING_N_HASH_2 (key->name, key->length);
-#endif
+# endif
 #endif
 }
@@ -210 +210 @@
   if (result)
     return result;
-#ifdef KMK /* speed */
+#ifdef KMK /* bird: speed */
   {
     const char *xs = x->name;
@@ -249 +249 @@
   }
 #endif /* KMK */
-#ifdef VARIABLE_HASH_STRICT
+#ifdef VARIABLE_HASH_STRICT /* bird */
   if (x->hash1 != variable_hash_a (x->name, x->length))
     __asm__("int3");
@@ -333 +333 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   var_key.hash1 = variable_hash_a (name, length);
   var_key.hash2 = 0;
@@ -373 +373 @@
   v->name = savestring (name, length);
   v->length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   v->hash1 = variable_hash_a (name, length);
   v->hash2 = 0;
@@ -514 +514 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   var_key.hash1 = variable_hash_a (name, length);
   var_key.hash2 = 0;
@@ -603 +603 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   var_key.hash1 = variable_hash_a (name, length);
   var_key.hash2 = 0;
@@ -903 +903 @@
   (void) define_variable ("MAKE_VERSION", 12, buf, o_default, 0);
 
+#ifdef KMK
   /* Define KMK_VERSION to indicate kMk. */
   (void) define_variable ("KMK_VERSION", 11, buf, o_default, 0);
@@ -908 +909 @@
   /* Define KMK_FEATURES to indicate various working KMK features. */
   (void) define_variable ("KMK_FEATURES", 12, "abspath toupper tolower", o_default, 0);
+#endif
 
 #ifdef CONFIG_WITH_KMK_BUILTIN
@@ -1135 +1137 @@
   makelevel_key.name = MAKELEVEL_NAME;
   makelevel_key.length = MAKELEVEL_LENGTH;
-#ifdef VARIABLE_HASH
+#ifdef VARIABLE_HASH /* bird */
   makelevel_key.hash1 = variable_hash_a (MAKELEVEL_NAME, MAKELEVEL_LENGTH);
   makelevel_key.hash2 = 0;