Changeset 2736 in kBuild for trunk/src

Timestamp:

Dec 23, 2014 9:15:40 PM (10 years ago)

Author:

bird

Message:

llvm build fixes.

Location:

trunk/src/kmk

Files:

• kmkbuiltin.h (modified) (1 diff)
• kmkbuiltin/test.c (modified) (1 diff)
• variable.c (modified) (2 diffs)

trunk/src/kmk/kmkbuiltin.h

@@ -51 +51 @@
 extern int kmk_builtin_rmdir(int argc, char **argv, char **envp);
 extern int kmk_builtin_sleep(int argc, char **argv, char **envp);
-extern int kmk_builtin_test(int argc, char **argv, char **envp, char ***ppapszArgvSpawn);
+extern int kmk_builtin_test(int argc, char **argv, char **envp
+#ifndef kmk_builtin_test
+                            , char ***ppapszArgvSpawn
+#endif
+                            );
 extern int kmk_builtin_kDepIDB(int argc, char **argv, char **envp);
 extern int kmk_builtin_kDepObj(int argc, char **argv, char **envp);

trunk/src/kmk/kmkbuiltin/test.c

@@ -202 +202 @@
 #endif
 
-int kmk_builtin_test(int argc, char **argv, char **envp, char ***ppapszArgvSpawn)
+int kmk_builtin_test(int argc, char **argv, char **envp
+#ifndef kmk_builtin_test
+                     , char ***ppapszArgvSpawn
+#endif
+                     )
 {
         int res;

trunk/src/kmk/variable.c

@@ -1010 +1010 @@
 {
   struct variable var_key;
-#ifdef KMK
   struct variable *v;
-#endif
 #ifndef CONFIG_WITH_STRCACHE2
   var_key.name = (char *) name;
@@ -1025 +1023 @@
   if (length > 3 && name[0] == '[' && set == &global_variable_set)
     {
-      struct variable *v = lookup_kbuild_object_variable_accessor(name, length);
+      v = lookup_kbuild_object_variable_accessor(name, length);
       if (v != VAR_NOT_KBUILD_ACCESSOR)
         {