libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fix silly bug

This commit is contained in:
Phillip Stephens 2014-06-02 20:09:40 -07:00
parent 05db171ac4
commit cc71bec5d7
11 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Athena.pri
View File

@ -104,7 +104,7 @@ HEADERS += \
$$PWD/include/Athena/ZQuestFileWriter.hpp $$PWD/include/Athena/ZQuestFileWriter.hpp
win32:HEADERS += \ win32:HEADERS += \
$$PWD/Athena/include/win32_largefilewrapper.h $$PWD/include/win32_largefilewrapper.h
OTHER_FILES += \ OTHER_FILES += \
.travis.yml .travis.yml

2
include/Athena/ALTTPFileReader.hpp
View File

@ -36,7 +36,7 @@ namespace io
*/ */
class ALTTPFileReader : protected BinaryReader class ALTTPFileReader : protected BinaryReader
{ {
BINARYREADER_BASE BINARYREADER_BASE();
public: public:
/*! \brief This constructor takes an existing buffer to read from. /*! \brief This constructor takes an existing buffer to read from.

4
include/Athena/BinaryReader.hpp
View File

@ -292,9 +292,9 @@ protected:
} // Athena } // Athena
#ifndef BINARYREADER_BASE #ifndef BINARYREADER_BASE
#define BINARYREADER_BASE \ #define BINARYREADER_BASE() \
private: \ private: \
typedef Athena::io::BinaryReader base; typedef Athena::io::BinaryReader base
#endif // BINARYREADER_BASE #endif // BINARYREADER_BASE

12
include/Athena/Global.hpp
View File

@ -20,8 +20,18 @@
#include "Athena/Utility.hpp" #include "Athena/Utility.hpp"
#include <iostream> #include <iostream>
#if !defined(__PRETTY_FUNCTION__) && defined(_WIN32) #ifndef __PRETTY_FUNCTION__
# ifdef __FUNCSIG__
# define __PRETTY_FUNCTION__ __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 #endif
#ifndef aDebug #ifndef aDebug

2
include/Athena/MCFileReader.hpp
View File

@ -35,7 +35,7 @@ namespace io
*/ */
class MCFileReader : protected BinaryReader class MCFileReader : protected BinaryReader
{ {
BINARYREADER_BASE BINARYREADER_BASE();
public: public:
/*! /*!
* \brief This constructor takes an existing buffer to read from. * \brief This constructor takes an existing buffer to read from.

2
include/Athena/SkywardSwordFileReader.hpp
View File

@ -25,7 +25,7 @@ namespace io
{ {
class SkywardSwordFileReader : public BinaryReader class SkywardSwordFileReader : public BinaryReader
{ {
BINARYREADER_BASE BINARYREADER_BASE();
public: public:
SkywardSwordFileReader(Uint8* data, Uint64 length); SkywardSwordFileReader(Uint8* data, Uint64 length);

2
include/Athena/SpriteFileReader.hpp
View File

@ -30,7 +30,7 @@ namespace io
class SpriteFileReader : public BinaryReader class SpriteFileReader : public BinaryReader
{ {
BINARYREADER_BASE; BINARYREADER_BASE();
public: public:
SpriteFileReader(Uint8* data, Uint64 length); SpriteFileReader(Uint8* data, Uint64 length);
SpriteFileReader(const std::string& filepath); SpriteFileReader(const std::string& filepath);

2
include/Athena/WiiSaveReader.hpp
View File

@ -38,7 +38,7 @@ namespace io
*/ */
class WiiSaveReader : protected BinaryReader class WiiSaveReader : protected BinaryReader
{ {
BINARYREADER_BASE BINARYREADER_BASE();
public: public:
/*! \brief This constructor takes an existing buffer to read from. /*! \brief This constructor takes an existing buffer to read from.
* *

2
include/Athena/ZQuestFileReader.hpp
View File

@ -30,7 +30,7 @@ namespace io
*/ */
class ZQuestFileReader : protected BinaryReader class ZQuestFileReader : protected BinaryReader
{ {
BINARYREADER_BASE BINARYREADER_BASE();
public: public:
/*! /*!

2
include/win32_largefilewrapper.h
View File

@ -1,7 +1,7 @@
#ifndef WIN32_LARGEFILEWRAPPER_H #ifndef WIN32_LARGEFILEWRAPPER_H
#define WIN32_LARGEFILEWRAPPER_H #define WIN32_LARGEFILEWRAPPER_H
#ifdef _WIN32 #if defined(_WIN32) && defined(_MSC_VER)
#include <stdio.h> #include <stdio.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
src/win32_largefilewrapper.c
View File

@ -1,7 +1,7 @@
#include "win32_largefilewrapper.h" #include "win32_largefilewrapper.h"
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32 #if defined(_WIN32) && defined(_MSC_VER)
int fseeko64(FILE* fp, off64_t offset, int whence) int fseeko64(FILE* fp, off64_t offset, int whence)
{ {
return _fseeki64(fp, offset, whence); return _fseeki64(fp, offset, whence);