Fix build for latest r2-599

Author: radare

src/core/Iaito.cpp

@@ -26,7 +26,7 @@
 #include <r_cmd.h>
 #include <r_core.h>
 
-#if R2_VERSION_NUMBER >= 50809 // reverse compatability
+#if R2_VERSION_NUMBER >= 50809
 #define BO bo
 #else
 #define BO o
@@ -217,8 +217,9 @@ void IaitoCore::initialize(bool loadPlugins)
 	// Executable is in appdir/bin
 	prefix.cdUp();
 	qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for AppImage.";
-#else // MACOS_R2_BUNDLED \
-      // Executable is in Contents/MacOS, prefix is Contents/Resources/r2
+#else
+	// MACOS_R2_BUNDLED
+	// Executable is in Contents/MacOS, prefix is Contents/Resources/r2
 	prefix.cdUp();
 	prefix.cd("Resources");
 	prefix.cd("r2");
@@ -2862,7 +2863,11 @@ QList<ImportDescription> IaitoCore::getAllImports()
             fi = r_flag_get(core->flags, fname);
         }
         free(fname);
+#if R2_VERSION_NUMBER >= 50909
+        ut64 addr = fi ? fi->addr : 0;
+#else
         ut64 addr = fi ? fi->offset : 0;
+#endif
         imp.plt = addr;
         imp.name = QString(name);
         imp.bind = QString(bi->bind);

src/dialogs/FlagDialog.cpp

@@ -17,7 +17,11 @@ FlagDialog::FlagDialog(RVA offset, QWidget *parent)
     RFlagItem *flag = r_flag_get_i(Core()->core()->flags, offset);
     if (flag) {
         flagName = QString(flag->name);
+#if R2_VERSION_NUMBER >= 50909
+        flagOffset = flag->addr;
+#else
         flagOffset = flag->offset;
+#endif
     }
 
     auto size_validator = new QIntValidator(ui->sizeEdit);