Rename Magenta to Zircon
Change-Id: I1a7bdfc862c14f5caee66339948ba6ba9bf868db
diff --git a/BUILD.gn b/BUILD.gn
index 8303c9f..f2fca44 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -338,7 +338,7 @@
libs = [
"launchpad",
- "magenta",
+ "zircon",
]
configs += [ ":sbase_config" ]
diff --git a/rules.mk b/rules.mk
index d3b3802..2182f99 100644
--- a/rules.mk
+++ b/rules.mk
@@ -107,7 +107,7 @@
xinstall \
yes \
-THIRD_PARTY_SBASE_LIBS := system/ulib/mxio system/ulib/c
+THIRD_PARTY_SBASE_LIBS := system/ulib/fdio system/ulib/c
THIRD_PARTY_SBASE_CFLAGS := \
-Wno-sign-compare \
@@ -130,6 +130,6 @@
$(foreach pgm,$(SBASE_PROGRAMS),$(call make-sbase-program,$(pgm)))
-THIRD_PARTY_SBASE_LIBS := system/ulib/launchpad system/ulib/magenta system/ulib/mxio system/ulib/c
+THIRD_PARTY_SBASE_LIBS := system/ulib/launchpad system/ulib/zircon system/ulib/fdio system/ulib/c
$(call make-sbase-program,xargs)
diff --git a/xargs.c b/xargs.c
index 242a318..5c69768 100644
--- a/xargs.c
+++ b/xargs.c
@@ -138,7 +138,7 @@
#ifdef __Fuchsia__
#include <launchpad/launchpad.h>
-#include <magenta/syscalls.h>
+#include <zircon/syscalls.h>
static void
launch_and_wait(const char* fn, char* const argv[])
@@ -150,15 +150,15 @@
launchpad_t* lp;
launchpad_create(0, fn, &lp);
- int nofile = (launchpad_load_from_file(lp, fn) != MX_OK);
+ int nofile = (launchpad_load_from_file(lp, fn) != ZX_OK);
launchpad_set_args(lp, argc, (void*) argv);
launchpad_clone(lp, LP_CLONE_ALL);
- mx_handle_t proc;
- mx_status_t status = launchpad_go(lp, &proc, NULL);
+ zx_handle_t proc;
+ zx_status_t status = launchpad_go(lp, &proc, NULL);
- if (status == MX_OK) {
- mx_object_wait_one(proc, MX_PROCESS_TERMINATED, MX_TIME_INFINITE, NULL);
+ if (status == ZX_OK) {
+ zx_object_wait_one(proc, ZX_PROCESS_TERMINATED, ZX_TIME_INFINITE, NULL);
} else {
errno = nofile ? ENOENT : EIO;
weprintf("execvp %s:", *cmd);
