From 9174c872035aa78ca5ec842a086611037bc17bc1 Mon Sep 17 00:00:00 2001
From: Haroon Qureshi <haroonq@google.com>
Date: Wed, 15 Oct 2025 04:06:53 -0700
Subject: [PATCH] Minor fixes.

PiperOrigin-RevId: 819680566
Change-Id: Ie2480eab3c974227268222190fdb84ed671303f2
---
 src/experimental/studio/main.cc    | 5 ++---
 src/experimental/toolbox/window.cc | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/experimental/studio/main.cc b/src/experimental/studio/main.cc
index 95fec7a9..118cf7c5 100644
--- a/src/experimental/studio/main.cc
+++ b/src/experimental/studio/main.cc
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "third_party/absl/flags/flag.h"
-#include "third_party/mujoco/google/runfiles/runfiles.h"
 #include "experimental/studio/app.h"
 
 ABSL_FLAG(int, window_width, 1400, "Window width");
@@ -31,7 +30,7 @@ ABSL_FLAG(int, window_height, 700, "Window height");
 ABSL_FLAG(std::string, model_file, "", "MuJoCo model file.");
 
 static std::vector<std::byte> LoadAsset(std::string_view path) {
-  std::ifstream file(path, std::ios::binary | std::ios::ate);
+  std::ifstream file(std::string(path), std::ios::binary | std::ios::ate);
   if (!file.is_open()) {
     return {};
   }
@@ -48,7 +47,7 @@ int main(int argc, char** argv, char** envp) {
 
   const int width = absl::GetFlag(FLAGS_window_width);
   const int height = absl::GetFlag(FLAGS_window_height);
-  const std::string ini_path = file::JoinPath(getenv("HOME"), ".mujoco.ini");
+  const std::string ini_path = std::string(getenv("HOME")) + "/.mujoco.ini";
   mujoco::studio::App app(width, height, ini_path, LoadAsset);
 
   // If the model file is not specified, try to load it from the first argument
diff --git a/src/experimental/toolbox/window.cc b/src/experimental/toolbox/window.cc
index 72512e77..1413b239 100644
--- a/src/experimental/toolbox/window.cc
+++ b/src/experimental/toolbox/window.cc
@@ -30,6 +30,11 @@
 #include "experimental/toolbox/helpers.h"
 #include <mujoco/mujoco.h>
 
+// Because X11/Xlib.h defines Status.
+#ifdef Status
+#undef Status
+#endif
+
 namespace mujoco::toolbox {
 
 static void InitImGui(SDL_Window* window, const LoadAssetFn& load_asset_fn) {