Skip to content

Commit 2cbbfd1

Browse files
authored
Merge pull request #32 from wsoltys/master
fixed: make ArduinoFloppyReader compile under linux
2 parents 8a63847 + cac4576 commit 2cbbfd1

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

ArduinoFloppyReader/lib/ADFWriter.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ const long long StreamMax = std::numeric_limits<std::streamsize>::max();
5555
#else
5656
#include <algorithm>
5757
#include <netdb.h>
58+
#include <unistd.h>
59+
#define Sleep sleep
60+
#define memcpy_s(a,b,c,d) memcpy(a,c,d)
5861
#endif
5962

6063
#include "pll.h"
@@ -1407,7 +1410,7 @@ ADFResult ADFWriter::sectorFileToDisk(const std::wstring& inputFile, const bool
14071410
#else
14081411
std::string inputFileA;
14091412
quickw2a(inputFile, inputFileA);
1410-
std::ifstream hADFFile(inputFileA, std::ifstream::in | std::ifstream::binary);
1413+
std::ifstream hFile(inputFileA, std::ifstream::in | std::ifstream::binary);
14111414
#endif
14121415
if (!hFile.is_open()) return ADFResult::adfrFileError;
14131416

ArduinoFloppyReader/lib/ibm_sectors.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
#include <iomanip>
1919
#include <vector>
2020
#include <unordered_map>
21+
#ifndef _WIN32
22+
#include <cstring>
23+
#include <cmath>
24+
#endif
2125
#include "ibm_sectors.h"
2226

2327
namespace IBM {
@@ -502,4 +506,4 @@ namespace IBM {
502506
return (uint32_t)(mem - ((uint8_t*)trackData));
503507
}
504508

505-
}
509+
}

0 commit comments

Comments
 (0)