retrace: Implement glxCopySubBufferMESA

[apitrace] / cli / cli_diff_state.cpp

diff --git a/cli/cli_diff_state.cpp b/cli/cli_diff_state.cpp
index 7f75484289fae30e70edbfe593611c0e8cca59ab..a802b12a6bdf18f573d09ca9315c8e396627eeb1 100644 (file)
--- a/cli/cli_diff_state.cpp
+++ b/cli/cli_diff_state.cpp
@@ -33,7 +33,7 @@
 #include "cli.hpp"
 #include "os_string.hpp"
 #include "os_process.hpp"
-#include "trace_resource.hpp"
+#include "cli_resources.hpp"
 
 static const char *synopsis = "Identify differences between two state dumps.";
 
@@ -66,7 +66,7 @@ command(int argc, char *argv[])
             usage();
             return 0;
         default:
-            std::cerr << "error: unexpected option `" << opt << "`\n";
+            std::cerr << "error: unexpected option `" << (char)opt << "`\n";
             usage();
             return 1;
         }
@@ -83,7 +83,7 @@ command(int argc, char *argv[])
     file1 = argv[optind];
     file2 = argv[optind + 1];
 
-    os::String command = trace::findScript("jsondiff.py");
+    os::String command = findScript("jsondiff.py");
 
     char *args[5];