Merge remote-tracking branch 'adfaure/master'

[simgrid.git] / src / mc / Frame.cpp

diff --git a/src/mc/Frame.cpp b/src/mc/Frame.cpp
index 5a114d8..135b79c 100644 (file)
--- a/src/mc/Frame.cpp
+++ b/src/mc/Frame.cpp
@@ -4,6 +4,10 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <libunwind.h>
+
+#include <xbt/sysdep.h>
+
 #include "src/mc/Frame.hpp"
 
 namespace simgrid {
@@ -13,13 +17,13 @@ void* Frame::frame_base(unw_cursor_t& unw_cursor) const
 {
   simgrid::dwarf::Location location = simgrid::dwarf::resolve(
                              frame_base_location, object_info,
-                             &unw_cursor, NULL, NULL, -1);
+                             &unw_cursor, nullptr, nullptr, -1);
   if (location.in_memory())
     return location.address();
   else if (location.in_register()) {
     // This is a special case.
-    // The register if not the location of the frame base
-    // (a frame base cannot be located in a register)
+    // The register is not the location of the frame base
+    // (a frame base cannot be located in a register).
     // Instead, DWARF defines this to mean that the register
     // contains the address of the frame base.
     unw_word_t word;