2nd attempt to solve compilation errors on windows

develop
Myk Taylor 2020-08-11 17:06:28 -07:00
parent 4f88bb4c3d
commit 39ae2d95fc
1 changed files with 6 additions and 6 deletions

@ -5,30 +5,30 @@
namespace DFHack { namespace DFHack {
// xlsxreader definitions // xlsxreader definitions
struct xlsx_file_handle_identity : public compound_identity { struct DFHACK_EXPORT xlsx_file_handle_identity : public compound_identity {
xlsx_file_handle_identity() xlsx_file_handle_identity()
:compound_identity(0, nullptr, nullptr, "xlsx_file_handle") {}; :compound_identity(0, nullptr, nullptr, "xlsx_file_handle") {};
DFHack::identity_type type() override { return IDTYPE_OPAQUE; } DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
}; };
struct xlsx_sheet_handle_identity : public compound_identity { struct DFHACK_EXPORT xlsx_sheet_handle_identity : public compound_identity {
xlsx_sheet_handle_identity() xlsx_sheet_handle_identity()
:compound_identity(0, nullptr, nullptr, "xlsx_sheet_handle") {}; :compound_identity(0, nullptr, nullptr, "xlsx_sheet_handle") {};
DFHack::identity_type type() override { return IDTYPE_OPAQUE; } DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
}; };
struct xlsx_file_handle { struct DFHACK_EXPORT xlsx_file_handle {
typedef struct xlsxio_read_struct* xlsxioreader; typedef struct xlsxio_read_struct* xlsxioreader;
const xlsxioreader handle; const xlsxioreader handle;
xlsx_file_handle(xlsxioreader handle): handle(handle) {} xlsx_file_handle(xlsxioreader handle): handle(handle) {}
DFHACK_IMPORT static xlsx_file_handle_identity _identity; static xlsx_file_handle_identity _identity;
}; };
struct xlsx_sheet_handle { struct DFHACK_EXPORT xlsx_sheet_handle {
typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet; typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet;
const xlsxioreadersheet handle; const xlsxioreadersheet handle;
xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {} xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
DFHACK_IMPORT static xlsx_sheet_handle_identity _identity; static xlsx_sheet_handle_identity _identity;
}; };
} }