mirror of https://github.com/libAthena/athena.git
* Fix silly bug
This commit is contained in:
parent
05db171ac4
commit
cc71bec5d7
|
@ -104,7 +104,7 @@ HEADERS += \
|
|||
$$PWD/include/Athena/ZQuestFileWriter.hpp
|
||||
|
||||
win32:HEADERS += \
|
||||
$$PWD/Athena/include/win32_largefilewrapper.h
|
||||
$$PWD/include/win32_largefilewrapper.h
|
||||
|
||||
OTHER_FILES += \
|
||||
.travis.yml
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace io
|
|||
*/
|
||||
class ALTTPFileReader : protected BinaryReader
|
||||
{
|
||||
BINARYREADER_BASE
|
||||
BINARYREADER_BASE();
|
||||
|
||||
public:
|
||||
/*! \brief This constructor takes an existing buffer to read from.
|
||||
|
|
|
@ -292,9 +292,9 @@ protected:
|
|||
} // Athena
|
||||
|
||||
#ifndef BINARYREADER_BASE
|
||||
#define BINARYREADER_BASE \
|
||||
#define BINARYREADER_BASE() \
|
||||
private: \
|
||||
typedef Athena::io::BinaryReader base;
|
||||
typedef Athena::io::BinaryReader base
|
||||
|
||||
#endif // BINARYREADER_BASE
|
||||
|
||||
|
|
|
@ -20,8 +20,18 @@
|
|||
#include "Athena/Utility.hpp"
|
||||
#include <iostream>
|
||||
|
||||
#if !defined(__PRETTY_FUNCTION__) && defined(_WIN32)
|
||||
#ifndef __PRETTY_FUNCTION__
|
||||
# ifdef __FUNCSIG__
|
||||
# define __PRETTY_FUNCTION__ __FUNCSIG__
|
||||
# elif defined(__FUNCTION__)
|
||||
# define __PRETTY_FUNCTION__ __FUNCTION__
|
||||
# elif defined(__FUNC__)
|
||||
# define __PRETTY_FUNCTION__ __FUNCTION__
|
||||
# elif defined(__func__)
|
||||
# define __PRETTY_FUNCTION__ __FUNCTION__
|
||||
# else
|
||||
# define __PRETTY_FUNCTION__ "<unkown>"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef aDebug
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace io
|
|||
*/
|
||||
class MCFileReader : protected BinaryReader
|
||||
{
|
||||
BINARYREADER_BASE
|
||||
BINARYREADER_BASE();
|
||||
public:
|
||||
/*!
|
||||
* \brief This constructor takes an existing buffer to read from.
|
||||
|
|
|
@ -25,7 +25,7 @@ namespace io
|
|||
{
|
||||
class SkywardSwordFileReader : public BinaryReader
|
||||
{
|
||||
BINARYREADER_BASE
|
||||
BINARYREADER_BASE();
|
||||
public:
|
||||
|
||||
SkywardSwordFileReader(Uint8* data, Uint64 length);
|
||||
|
|
|
@ -30,7 +30,7 @@ namespace io
|
|||
|
||||
class SpriteFileReader : public BinaryReader
|
||||
{
|
||||
BINARYREADER_BASE;
|
||||
BINARYREADER_BASE();
|
||||
public:
|
||||
SpriteFileReader(Uint8* data, Uint64 length);
|
||||
SpriteFileReader(const std::string& filepath);
|
||||
|
|
|
@ -38,7 +38,7 @@ namespace io
|
|||
*/
|
||||
class WiiSaveReader : protected BinaryReader
|
||||
{
|
||||
BINARYREADER_BASE
|
||||
BINARYREADER_BASE();
|
||||
public:
|
||||
/*! \brief This constructor takes an existing buffer to read from.
|
||||
*
|
||||
|
|
|
@ -30,7 +30,7 @@ namespace io
|
|||
*/
|
||||
class ZQuestFileReader : protected BinaryReader
|
||||
{
|
||||
BINARYREADER_BASE
|
||||
BINARYREADER_BASE();
|
||||
|
||||
public:
|
||||
/*!
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef WIN32_LARGEFILEWRAPPER_H
|
||||
#define WIN32_LARGEFILEWRAPPER_H
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
#include <stdio.h>
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "win32_largefilewrapper.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined(_WIN32) && defined(_MSC_VER)
|
||||
int fseeko64(FILE* fp, off64_t offset, int whence)
|
||||
{
|
||||
return _fseeki64(fp, offset, whence);
|
||||
|
|
Loading…
Reference in New Issue