38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
|
--- FFB8.org/util/xvx2gf/XVX.h 2013-03-26 10:09:49.000000000 +0900
|
|||
|
|
+++ FFB8.new/util/xvx2gf/XVX.h 2020-06-24 14:27:32.000000000 +0900
|
|||
|
|
@@ -5,6 +5,7 @@
|
|||
|
|
#include <algorithm>
|
|||
|
|
#include <cassert>
|
|||
|
|
#include <vector>
|
|||
|
|
+#include <inttypes.h>
|
|||
|
|
|
|||
|
|
#define MAX_LEVEL 32
|
|||
|
|
|
|||
|
|
@@ -182,25 +183,7 @@ public:
|
|||
|
|
void *_ptr;
|
|||
|
|
unsigned char volptr[3];// <20>Ƃ肠<C682><E882A0><EFBFBD><EFBFBD><EFBFBD>ő<EFBFBD>256^3<>܂<EFBFBD> uint<6E>ɂ<EFBFBD><C982><EFBFBD>bitmask<73><6B><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1024^3
|
|||
|
|
|
|||
|
|
- #if _WIN64 // _WIN32<33>Ə<EFBFBD><C68F>Ԃ<EFBFBD><D482>ς<EFBFBD><CF82><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>̂Œ<CC82><C592>Ӂi64<36>r<EFBFBD>b<EFBFBD>gWindows<77><EFBFBD><C28B>ł́A_WIN32<33><32>_WIN64<36>̗<EFBFBD><CC97><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>j
|
|||
|
|
- typedef unsigned long long int PtrAsInt;
|
|||
|
|
- #elif _WIN32
|
|||
|
|
- typedef unsigned int PtrAsInt;
|
|||
|
|
- #elif __APPLE__
|
|||
|
|
- #if x86_64
|
|||
|
|
- typedef unsigned long long int PtrAsInt;
|
|||
|
|
- #else
|
|||
|
|
- typedef unsigned int PtrAsInt;
|
|||
|
|
- #endif
|
|||
|
|
- #elif __linux__
|
|||
|
|
- #if __x86_64__
|
|||
|
|
- typedef unsigned long long int PtrAsInt;
|
|||
|
|
- #else
|
|||
|
|
- typedef unsigned int PtrAsInt;
|
|||
|
|
- #endif
|
|||
|
|
- #else
|
|||
|
|
- #error you must typedef 'PtrAsInt'
|
|||
|
|
- #endif
|
|||
|
|
+ typedef size_t PtrAsInt;
|
|||
|
|
}ALIGNMENT;
|
|||
|
|
#ifdef __GNUC__
|
|||
|
|
#pragma pack(pop)
|