Merge branch 'master' into experimental_varlen

* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation

client/fido/cbortools.c

@@ -204,12 +204,10 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, bool isResponse, uint8_t *data, si
 
     if (err) {
         fprintf(stderr,
-#if __WORDSIZE == 64
-                "CBOR parsing failure at offset %" PRId64 " : %s\n",
-#else
                 "CBOR parsing failure at offset %" PRId32 " : %s\n",
-#endif
-                cb.ptr - data, cbor_error_string(err));
+                (uint32_t)(cb.ptr - data),
+                cbor_error_string(err)
+                );
         return 1;
     }