blob: 6d14900d1e464d1c60255e7eac09eb4d4201e99f (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- 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];// �Ƃ肠�����ő�256^3�܂� uint�ɂ���bitmask�����1024^3
- #if _WIN64 // _WIN32�Ə��Ԃ�ς���Ƃ��������Ȃ�̂Œ��Ӂi64�r�b�gWindows���ł́A_WIN32��_WIN64�̗�������`�����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)
|