Commits (2)
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <climits> #include <climits>
#include <cstdint> #include <cstdint>
#include <algorithm> // std::min
#include "gen_defs.h" #include "gen_defs.h"
#include "xpendian.h" #include "xpendian.h"
...@@ -36,7 +37,7 @@ public: ...@@ -36,7 +37,7 @@ public:
} }
void operator = (const char* s) { void operator = (const char* s) {
memset(buf, 0, size); memset(buf, 0, size);
buf[0] = (uint8_t)min(size, strlen(s)); buf[0] = (uint8_t)std::min(size, strlen(s));
memcpy(buf + 1, s, len()); memcpy(buf + 1, s, len());
} }
}; };
......
...@@ -147,7 +147,6 @@ void sbbs_t::xtrndat(const char *name, const char *dropdir, uchar type, ulong tl ...@@ -147,7 +147,6 @@ void sbbs_t::xtrndat(const char *name, const char *dropdir, uchar type, ulong tl
/* TODO: 16-bit i */ /* TODO: 16-bit i */
int16_t i; int16_t i;
int file; int file;
uint16_t w;
int32_t l; int32_t l;
struct tm tm; struct tm tm;
struct tm tl; struct tm tl;
......