ffi 1.11.3-x86-mingw32 → 1.13.1-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/.appveyor.yml +3 -0
  3. data/.github/workflows/ci.yml +64 -0
  4. data/.travis.yml +21 -5
  5. data/CHANGELOG.md +68 -0
  6. data/Gemfile +6 -4
  7. data/README.md +10 -1
  8. data/Rakefile +24 -43
  9. data/ffi.gemspec +3 -3
  10. data/lib/ffi.rb +10 -2
  11. data/lib/ffi/ffi.rb +1 -0
  12. data/lib/ffi/library.rb +5 -1
  13. data/lib/ffi/platform.rb +6 -2
  14. data/lib/ffi/platform/arm-linux/types.conf +32 -4
  15. data/lib/ffi/platform/i386-windows/types.conf +26 -79
  16. data/lib/ffi/platform/powerpc-linux/types.conf +32 -2
  17. data/lib/ffi/platform/powerpc-openbsd/types.conf +156 -0
  18. data/lib/ffi/platform/sparcv9-openbsd/types.conf +156 -0
  19. data/lib/ffi/platform/x86_64-darwin/types.conf +4 -0
  20. data/lib/ffi/platform/x86_64-dragonflybsd/types.conf +4 -22
  21. data/lib/ffi/platform/x86_64-linux/types.conf +21 -0
  22. data/lib/ffi/platform/x86_64-windows/types.conf +10 -78
  23. data/lib/ffi/pointer.rb +19 -12
  24. data/lib/ffi/struct.rb +10 -5
  25. data/lib/ffi/tools/types_generator.rb +2 -0
  26. data/lib/ffi/version.rb +1 -1
  27. data/samples/getlogin.rb +1 -1
  28. data/samples/getpid.rb +1 -1
  29. data/samples/gettimeofday.rb +8 -8
  30. data/samples/hello.rb +2 -1
  31. data/samples/inotify.rb +1 -1
  32. data/samples/pty.rb +1 -2
  33. data/samples/qsort.rb +0 -1
  34. metadata +13 -12
  35. data/samples/sample_helper.rb +0 -6
data/lib/ffi/platform/sparcv9-openbsd/types.conf ADDED
@@ -0,0 +1,156 @@
1
+ rbx.platform.typedef.__blkcnt_t = long_long
2
+ rbx.platform.typedef.__blksize_t = int
3
+ rbx.platform.typedef.__clock_t = long_long
4
+ rbx.platform.typedef.__clockid_t = int
5
+ rbx.platform.typedef.__cpuid_t = ulong
6
+ rbx.platform.typedef.__dev_t = int
7
+ rbx.platform.typedef.__fd_mask = uint
8
+ rbx.platform.typedef.__fixpt_t = uint
9
+ rbx.platform.typedef.__fsblkcnt_t = ulong_long
10
+ rbx.platform.typedef.__fsfilcnt_t = ulong_long
11
+ rbx.platform.typedef.__gid_t = uint
12
+ rbx.platform.typedef.__id_t = uint
13
+ rbx.platform.typedef.__in_addr_t = uint
14
+ rbx.platform.typedef.__in_port_t = ushort
15
+ rbx.platform.typedef.__ino_t = ulong_long
16
+ rbx.platform.typedef.__int16_t = short
17
+ rbx.platform.typedef.__int32_t = int
18
+ rbx.platform.typedef.__int64_t = long_long
19
+ rbx.platform.typedef.__int8_t = char
20
+ rbx.platform.typedef.__int_fast16_t = int
21
+ rbx.platform.typedef.__int_fast32_t = int
22
+ rbx.platform.typedef.__int_fast64_t = long_long
23
+ rbx.platform.typedef.__int_fast8_t = int
24
+ rbx.platform.typedef.__int_least16_t = short
25
+ rbx.platform.typedef.__int_least32_t = int
26
+ rbx.platform.typedef.__int_least64_t = long_long
27
+ rbx.platform.typedef.__int_least8_t = char
28
+ rbx.platform.typedef.__intmax_t = long_long
29
+ rbx.platform.typedef.__intptr_t = long
30
+ rbx.platform.typedef.__key_t = long
31
+ rbx.platform.typedef.__mode_t = uint
32
+ rbx.platform.typedef.__nlink_t = uint
33
+ rbx.platform.typedef.__off_t = long_long
34
+ rbx.platform.typedef.__paddr_t = ulong
35
+ rbx.platform.typedef.__pid_t = int
36
+ rbx.platform.typedef.__psize_t = ulong
37
+ rbx.platform.typedef.__ptrdiff_t = long
38
+ rbx.platform.typedef.__register_t = long
39
+ rbx.platform.typedef.__rlim_t = ulong_long
40
+ rbx.platform.typedef.__rune_t = int
41
+ rbx.platform.typedef.__sa_family_t = uchar
42
+ rbx.platform.typedef.__segsz_t = int
43
+ rbx.platform.typedef.__size_t = ulong
44
+ rbx.platform.typedef.__socklen_t = uint
45
+ rbx.platform.typedef.__ssize_t = long
46
+ rbx.platform.typedef.__suseconds_t = long
47
+ rbx.platform.typedef.__swblk_t = int
48
+ rbx.platform.typedef.__time_t = long_long
49
+ rbx.platform.typedef.__timer_t = int
50
+ rbx.platform.typedef.__uid_t = uint
51
+ rbx.platform.typedef.__uint16_t = ushort
52
+ rbx.platform.typedef.__uint32_t = uint
53
+ rbx.platform.typedef.__uint64_t = ulong_long
54
+ rbx.platform.typedef.__uint8_t = uchar
55
+ rbx.platform.typedef.__uint_fast16_t = uint
56
+ rbx.platform.typedef.__uint_fast32_t = uint
57
+ rbx.platform.typedef.__uint_fast64_t = ulong_long
58
+ rbx.platform.typedef.__uint_fast8_t = uint
59
+ rbx.platform.typedef.__uint_least16_t = ushort
60
+ rbx.platform.typedef.__uint_least32_t = uint
61
+ rbx.platform.typedef.__uint_least64_t = ulong_long
62
+ rbx.platform.typedef.__uint_least8_t = uchar
63
+ rbx.platform.typedef.__uintmax_t = ulong_long
64
+ rbx.platform.typedef.__uintptr_t = ulong
65
+ rbx.platform.typedef.__useconds_t = uint
66
+ rbx.platform.typedef.__vaddr_t = ulong
67
+ rbx.platform.typedef.__vsize_t = ulong
68
+ rbx.platform.typedef.__wchar_t = int
69
+ rbx.platform.typedef.__wctrans_t = pointer
70
+ rbx.platform.typedef.__wctype_t = pointer
71
+ rbx.platform.typedef.__wint_t = int
72
+ rbx.platform.typedef.blkcnt_t = long_long
73
+ rbx.platform.typedef.blksize_t = int
74
+ rbx.platform.typedef.caddr_t = string
75
+ rbx.platform.typedef.clock_t = long_long
76
+ rbx.platform.typedef.clockid_t = int
77
+ rbx.platform.typedef.cpuid_t = ulong
78
+ rbx.platform.typedef.daddr32_t = int
79
+ rbx.platform.typedef.daddr_t = long_long
80
+ rbx.platform.typedef.dev_t = int
81
+ rbx.platform.typedef.fixpt_t = uint
82
+ rbx.platform.typedef.fsblkcnt_t = ulong_long
83
+ rbx.platform.typedef.fsfilcnt_t = ulong_long
84
+ rbx.platform.typedef.gid_t = uint
85
+ rbx.platform.typedef.id_t = uint
86
+ rbx.platform.typedef.in_addr_t = uint
87
+ rbx.platform.typedef.in_port_t = ushort
88
+ rbx.platform.typedef.ino_t = ulong_long
89
+ rbx.platform.typedef.int16_t = short
90
+ rbx.platform.typedef.int32_t = int
91
+ rbx.platform.typedef.int64_t = long_long
92
+ rbx.platform.typedef.int8_t = char
93
+ rbx.platform.typedef.int_fast16_t = int
94
+ rbx.platform.typedef.int_fast32_t = int
95
+ rbx.platform.typedef.int_fast64_t = long_long
96
+ rbx.platform.typedef.int_fast8_t = int
97
+ rbx.platform.typedef.int_least16_t = short
98
+ rbx.platform.typedef.int_least32_t = int
99
+ rbx.platform.typedef.int_least64_t = long_long
100
+ rbx.platform.typedef.int_least8_t = char
101
+ rbx.platform.typedef.intmax_t = long_long
102
+ rbx.platform.typedef.intptr_t = long
103
+ rbx.platform.typedef.key_t = long
104
+ rbx.platform.typedef.mode_t = uint
105
+ rbx.platform.typedef.nlink_t = uint
106
+ rbx.platform.typedef.off_t = long_long
107
+ rbx.platform.typedef.paddr_t = ulong
108
+ rbx.platform.typedef.pid_t = int
109
+ rbx.platform.typedef.psize_t = ulong
110
+ rbx.platform.typedef.ptrdiff_t = long
111
+ rbx.platform.typedef.quad_t = long_long
112
+ rbx.platform.typedef.register_t = long
113
+ rbx.platform.typedef.rlim_t = ulong_long
114
+ rbx.platform.typedef.sa_family_t = uchar
115
+ rbx.platform.typedef.segsz_t = int
116
+ rbx.platform.typedef.sigset_t = uint
117
+ rbx.platform.typedef.size_t = ulong
118
+ rbx.platform.typedef.socklen_t = uint
119
+ rbx.platform.typedef.ssize_t = long
120
+ rbx.platform.typedef.suseconds_t = long
121
+ rbx.platform.typedef.swblk_t = int
122
+ rbx.platform.typedef.time_t = long_long
123
+ rbx.platform.typedef.timer_t = int
124
+ rbx.platform.typedef.u_char = uchar
125
+ rbx.platform.typedef.u_int = uint
126
+ rbx.platform.typedef.u_int16_t = ushort
127
+ rbx.platform.typedef.u_int32_t = uint
128
+ rbx.platform.typedef.u_int64_t = ulong_long
129
+ rbx.platform.typedef.u_int8_t = uchar
130
+ rbx.platform.typedef.u_long = ulong
131
+ rbx.platform.typedef.u_quad_t = ulong_long
132
+ rbx.platform.typedef.u_short = ushort
133
+ rbx.platform.typedef.uid_t = uint
134
+ rbx.platform.typedef.uint = uint
135
+ rbx.platform.typedef.uint16_t = ushort
136
+ rbx.platform.typedef.uint32_t = uint
137
+ rbx.platform.typedef.uint64_t = ulong_long
138
+ rbx.platform.typedef.uint8_t = uchar
139
+ rbx.platform.typedef.uint_fast16_t = uint
140
+ rbx.platform.typedef.uint_fast32_t = uint
141
+ rbx.platform.typedef.uint_fast64_t = ulong_long
142
+ rbx.platform.typedef.uint_fast8_t = uint
143
+ rbx.platform.typedef.uint_least16_t = ushort
144
+ rbx.platform.typedef.uint_least32_t = uint
145
+ rbx.platform.typedef.uint_least64_t = ulong_long
146
+ rbx.platform.typedef.uint_least8_t = uchar
147
+ rbx.platform.typedef.uintmax_t = ulong_long
148
+ rbx.platform.typedef.uintptr_t = ulong
149
+ rbx.platform.typedef.ulong = ulong
150
+ rbx.platform.typedef.unchar = uchar
151
+ rbx.platform.typedef.useconds_t = uint
152
+ rbx.platform.typedef.ushort = ushort
153
+ rbx.platform.typedef.vaddr_t = ulong
154
+ rbx.platform.typedef.vsize_t = ulong
155
+ rbx.platform.typedef.wchar_t = int
156
+ rbx.platform.typedef.wint_t = int
data/lib/ffi/platform/x86_64-darwin/types.conf CHANGED
@@ -76,12 +76,15 @@ rbx.platform.typedef.nlink_t = ushort
76
76
  rbx.platform.typedef.off_t = long_long
77
77
  rbx.platform.typedef.pid_t = int
78
78
  rbx.platform.typedef.pthread_key_t = ulong
79
+ rbx.platform.typedef.ptrdiff_t = long
79
80
  rbx.platform.typedef.qaddr_t = pointer
80
81
  rbx.platform.typedef.quad_t = long_long
81
82
  rbx.platform.typedef.register_t = long_long
82
83
  rbx.platform.typedef.rlim_t = ulong_long
83
84
  rbx.platform.typedef.rsize_t = ulong
84
85
  rbx.platform.typedef.sa_family_t = uchar
86
+ rbx.platform.typedef.sae_associd_t = uint
87
+ rbx.platform.typedef.sae_connid_t = uint
85
88
  rbx.platform.typedef.segsz_t = int
86
89
  rbx.platform.typedef.size_t = ulong
87
90
  rbx.platform.typedef.socklen_t = uint
@@ -124,3 +127,4 @@ rbx.platform.typedef.user_ssize_t = long_long
124
127
  rbx.platform.typedef.user_time_t = long_long
125
128
  rbx.platform.typedef.user_ulong_t = ulong_long
126
129
  rbx.platform.typedef.ushort = ushort
130
+ rbx.platform.typedef.wchar_t = int
data/lib/ffi/platform/x86_64-dragonflybsd/types.conf CHANGED
@@ -1,9 +1,7 @@
1
1
  rbx.platform.typedef.*) = pointer
2
- rbx.platform.typedef.__char16_t = ushort
3
- rbx.platform.typedef.__char32_t = uint
2
+ rbx.platform.typedef.___wchar_t = int
4
3
  rbx.platform.typedef.__clock_t = ulong
5
4
  rbx.platform.typedef.__clockid_t = ulong
6
- rbx.platform.typedef.__ct_rune_t = int
7
5
  rbx.platform.typedef.__fd_mask = ulong
8
6
  rbx.platform.typedef.__int16_t = short
9
7
  rbx.platform.typedef.__int32_t = int
@@ -17,16 +15,14 @@ rbx.platform.typedef.__int_least16_t = short
17
15
  rbx.platform.typedef.__int_least32_t = int
18
16
  rbx.platform.typedef.__int_least64_t = long
19
17
  rbx.platform.typedef.__int_least8_t = char
18
+ rbx.platform.typedef.__intlp_t = long
20
19
  rbx.platform.typedef.__intmax_t = long
21
20
  rbx.platform.typedef.__intptr_t = long
22
- rbx.platform.typedef.__nl_item = int
23
21
  rbx.platform.typedef.__off_t = long
24
22
  rbx.platform.typedef.__pid_t = int
25
23
  rbx.platform.typedef.__ptrdiff_t = long
26
24
  rbx.platform.typedef.__register_t = long
27
25
  rbx.platform.typedef.__rlim_t = long
28
- rbx.platform.typedef.__rune_t = int
29
- rbx.platform.typedef.__segsz_t = long
30
26
  rbx.platform.typedef.__sig_atomic_t = int
31
27
  rbx.platform.typedef.__size_t = ulong
32
28
  rbx.platform.typedef.__socklen_t = uint
@@ -34,7 +30,6 @@ rbx.platform.typedef.__ssize_t = long
34
30
  rbx.platform.typedef.__suseconds_t = long
35
31
  rbx.platform.typedef.__time_t = long
36
32
  rbx.platform.typedef.__timer_t = int
37
- rbx.platform.typedef.__u_register_t = ulong
38
33
  rbx.platform.typedef.__uint16_t = ushort
39
34
  rbx.platform.typedef.__uint32_t = uint
40
35
  rbx.platform.typedef.__uint64_t = ulong
@@ -47,9 +42,9 @@ rbx.platform.typedef.__uint_least16_t = ushort
47
42
  rbx.platform.typedef.__uint_least32_t = uint
48
43
  rbx.platform.typedef.__uint_least64_t = ulong
49
44
  rbx.platform.typedef.__uint_least8_t = uchar
45
+ rbx.platform.typedef.__uintlp_t = ulong
50
46
  rbx.platform.typedef.__uintmax_t = ulong
51
47
  rbx.platform.typedef.__uintptr_t = ulong
52
- rbx.platform.typedef.__wchar_t = int
53
48
  rbx.platform.typedef.__wint_t = int
54
49
  rbx.platform.typedef.blkcnt_t = long
55
50
  rbx.platform.typedef.blksize_t = long
@@ -57,7 +52,6 @@ rbx.platform.typedef.c_caddr_t = pointer
57
52
  rbx.platform.typedef.caddr_t = string
58
53
  rbx.platform.typedef.clock_t = ulong
59
54
  rbx.platform.typedef.clockid_t = ulong
60
- rbx.platform.typedef.cpulock_t = uint
61
55
  rbx.platform.typedef.daddr_t = int
62
56
  rbx.platform.typedef.dev_t = uint
63
57
  rbx.platform.typedef.fixpt_t = uint
@@ -85,14 +79,9 @@ rbx.platform.typedef.intptr_t = long
85
79
  rbx.platform.typedef.key_t = long
86
80
  rbx.platform.typedef.lwpid_t = int
87
81
  rbx.platform.typedef.mode_t = ushort
88
- rbx.platform.typedef.mqd_t = int
89
82
  rbx.platform.typedef.nlink_t = uint
90
83
  rbx.platform.typedef.off_t = long
91
- rbx.platform.typedef.pd_entry_t = ulong
92
- rbx.platform.typedef.pdp_entry_t = ulong
93
84
  rbx.platform.typedef.pid_t = int
94
- rbx.platform.typedef.pml4_entry_t = ulong
95
- rbx.platform.typedef.pt_entry_t = ulong
96
85
  rbx.platform.typedef.pthread_key_t = int
97
86
  rbx.platform.typedef.ptrdiff_t = long
98
87
  rbx.platform.typedef.qaddr_t = pointer
@@ -116,7 +105,6 @@ rbx.platform.typedef.u_int64_t = ulong
116
105
  rbx.platform.typedef.u_int8_t = uchar
117
106
  rbx.platform.typedef.u_long = ulong
118
107
  rbx.platform.typedef.u_quad_t = ulong
119
- rbx.platform.typedef.u_register_t = ulong
120
108
  rbx.platform.typedef.u_short = ushort
121
109
  rbx.platform.typedef.uid_t = uint
122
110
  rbx.platform.typedef.uint = uint
@@ -139,10 +127,4 @@ rbx.platform.typedef.unchar = uchar
139
127
  rbx.platform.typedef.useconds_t = uint
140
128
  rbx.platform.typedef.ushort = ushort
141
129
  rbx.platform.typedef.v_caddr_t = pointer
142
- rbx.platform.typedef.vm_offset_t = ulong
143
- rbx.platform.typedef.vm_ooffset_t = long
144
- rbx.platform.typedef.vm_paddr_t = ulong
145
- rbx.platform.typedef.vm_pindex_t = ulong
146
- rbx.platform.typedef.vm_poff_t = ulong
147
- rbx.platform.typedef.vm_size_t = ulong
148
- rbx.platform.typedef.vm_spindex_t = ulong
130
+ rbx.platform.typedef.wchar_t = int
data/lib/ffi/platform/x86_64-linux/types.conf CHANGED
@@ -73,6 +73,15 @@ rbx.platform.typedef.int16_t = short
73
73
  rbx.platform.typedef.int32_t = int
74
74
  rbx.platform.typedef.int64_t = long
75
75
  rbx.platform.typedef.int8_t = char
76
+ rbx.platform.typedef.int_fast16_t = long
77
+ rbx.platform.typedef.int_fast32_t = long
78
+ rbx.platform.typedef.int_fast64_t = long
79
+ rbx.platform.typedef.int_fast8_t = char
80
+ rbx.platform.typedef.int_least32_t = int
81
+ rbx.platform.typedef.int_least64_t = long
82
+ rbx.platform.typedef.int_least8_t = char
83
+ rbx.platform.typedef.intmax_t = long
84
+ rbx.platform.typedef.intptr_t = long
76
85
  rbx.platform.typedef.key_t = int
77
86
  rbx.platform.typedef.loff_t = long
78
87
  rbx.platform.typedef.mode_t = uint
@@ -82,6 +91,7 @@ rbx.platform.typedef.pid_t = int
82
91
  rbx.platform.typedef.pthread_key_t = uint
83
92
  rbx.platform.typedef.pthread_once_t = int
84
93
  rbx.platform.typedef.pthread_t = ulong
94
+ rbx.platform.typedef.ptrdiff_t = long
85
95
  rbx.platform.typedef.quad_t = long
86
96
  rbx.platform.typedef.register_t = long
87
97
  rbx.platform.typedef.rlim_t = ulong
@@ -107,5 +117,16 @@ rbx.platform.typedef.uint16_t = ushort
107
117
  rbx.platform.typedef.uint32_t = uint
108
118
  rbx.platform.typedef.uint64_t = ulong
109
119
  rbx.platform.typedef.uint8_t = uchar
120
+ rbx.platform.typedef.uint_fast16_t = ulong
121
+ rbx.platform.typedef.uint_fast32_t = ulong
122
+ rbx.platform.typedef.uint_fast64_t = ulong
123
+ rbx.platform.typedef.uint_fast8_t = uchar
124
+ rbx.platform.typedef.uint_least16_t = ushort
125
+ rbx.platform.typedef.uint_least32_t = uint
126
+ rbx.platform.typedef.uint_least64_t = ulong
127
+ rbx.platform.typedef.uint_least8_t = uchar
128
+ rbx.platform.typedef.uintmax_t = ulong
129
+ rbx.platform.typedef.uintptr_t = ulong
110
130
  rbx.platform.typedef.ulong = ulong
111
131
  rbx.platform.typedef.ushort = ushort
132
+ rbx.platform.typedef.wchar_t = int
data/lib/ffi/platform/x86_64-windows/types.conf CHANGED
@@ -1,64 +1,20 @@
1
- rbx.platform.typedef.*addr_t = char
2
- rbx.platform.typedef.__ULong = ulong
3
- rbx.platform.typedef.__blkcnt32_t = long
4
- rbx.platform.typedef.__blkcnt64_t = long_long
5
- rbx.platform.typedef.__dev16_t = short
6
- rbx.platform.typedef.__dev32_t = ulong
7
- rbx.platform.typedef.__dev_t = short
8
- rbx.platform.typedef.__gid16_t = ushort
9
- rbx.platform.typedef.__gid32_t = ulong
10
- rbx.platform.typedef.__gid_t = ushort
11
- rbx.platform.typedef.__ino32_t = ulong
12
- rbx.platform.typedef.__ino64_t = ulong_long
13
- rbx.platform.typedef.__int16_t = short
14
- rbx.platform.typedef.__int32_t = int
15
- rbx.platform.typedef.__int64_t = long_long
16
- rbx.platform.typedef.__int8_t = char
17
- rbx.platform.typedef.__int_least16_t = short
18
- rbx.platform.typedef.__int_least32_t = int
19
- rbx.platform.typedef.__loff_t = long_long
20
- rbx.platform.typedef.__off_t = long
21
- rbx.platform.typedef.__pid_t = int
22
1
  rbx.platform.typedef.__time32_t = long
23
2
  rbx.platform.typedef.__time64_t = long_long
24
- rbx.platform.typedef.__uid16_t = ushort
25
- rbx.platform.typedef.__uid32_t = ulong
26
- rbx.platform.typedef.__uid_t = ushort
27
- rbx.platform.typedef.__uint16_t = ushort
28
- rbx.platform.typedef.__uint32_t = uint
29
- rbx.platform.typedef.__uint64_t = ulong_long
30
- rbx.platform.typedef.__uint8_t = uchar
31
- rbx.platform.typedef.__uint_least16_t = ushort
32
- rbx.platform.typedef.__uint_least32_t = uint
33
3
  rbx.platform.typedef._dev_t = uint
34
- rbx.platform.typedef._fpos64_t = long_long
35
- rbx.platform.typedef._fpos_t = long_long
36
4
  rbx.platform.typedef._ino_t = ushort
37
5
  rbx.platform.typedef._mode_t = ushort
38
6
  rbx.platform.typedef._off64_t = long_long
39
7
  rbx.platform.typedef._off_t = long
8
+ rbx.platform.typedef._pid_t = long_long
40
9
  rbx.platform.typedef._sigset_t = ulong_long
41
- rbx.platform.typedef._ssize_t = long_long
42
- rbx.platform.typedef.blkcnt_t = long_long
43
- rbx.platform.typedef.blksize_t = long
44
- rbx.platform.typedef.caddr_t = string
45
- rbx.platform.typedef.clock_t = ulong
46
- rbx.platform.typedef.clockid_t = ulong
47
- rbx.platform.typedef.daddr_t = long
48
10
  rbx.platform.typedef.dev_t = uint
49
11
  rbx.platform.typedef.errno_t = int
50
- rbx.platform.typedef.fd_mask = long
51
- rbx.platform.typedef.fpos_t = long_long
52
- rbx.platform.typedef.fsblkcnt_t = ulong
53
- rbx.platform.typedef.fsfilcnt_t = ulong
54
- rbx.platform.typedef.gid_t = ulong
55
- rbx.platform.typedef.id_t = ulong
56
12
  rbx.platform.typedef.ino_t = ushort
57
13
  rbx.platform.typedef.int16_t = short
58
14
  rbx.platform.typedef.int32_t = int
59
15
  rbx.platform.typedef.int64_t = long_long
60
16
  rbx.platform.typedef.int8_t = char
61
- rbx.platform.typedef.int_fast16_t = int
17
+ rbx.platform.typedef.int_fast16_t = short
62
18
  rbx.platform.typedef.int_fast32_t = int
63
19
  rbx.platform.typedef.int_fast64_t = long_long
64
20
  rbx.platform.typedef.int_fast8_t = char
@@ -68,53 +24,29 @@ rbx.platform.typedef.int_least64_t = long_long
68
24
  rbx.platform.typedef.int_least8_t = char
69
25
  rbx.platform.typedef.intmax_t = long_long
70
26
  rbx.platform.typedef.intptr_t = long_long
71
- rbx.platform.typedef.key_t = long_long
72
- rbx.platform.typedef.loff_t = long_long
73
27
  rbx.platform.typedef.mode_t = ushort
74
- rbx.platform.typedef.nlink_t = ushort
28
+ rbx.platform.typedef.off32_t = long
29
+ rbx.platform.typedef.off64_t = long_long
75
30
  rbx.platform.typedef.off_t = long_long
76
- rbx.platform.typedef.pid_t = int
31
+ rbx.platform.typedef.pid_t = long_long
77
32
  rbx.platform.typedef.ptrdiff_t = long_long
78
- rbx.platform.typedef.register_t = int
79
- rbx.platform.typedef.rlim_t = ulong
80
- rbx.platform.typedef.sa_family_t = ushort
81
- rbx.platform.typedef.sig_atomic_t = int
82
- rbx.platform.typedef.sigset_t = ulong
33
+ rbx.platform.typedef.rsize_t = ulong_long
83
34
  rbx.platform.typedef.size_t = ulong_long
84
- rbx.platform.typedef.socklen_t = int
85
- rbx.platform.typedef.ssize_t = int
86
- rbx.platform.typedef.suseconds_t = long
35
+ rbx.platform.typedef.ssize_t = long_long
87
36
  rbx.platform.typedef.time_t = long_long
88
- rbx.platform.typedef.timer_t = ulong
89
- rbx.platform.typedef.u_char = uchar
90
- rbx.platform.typedef.u_int = uint
91
- rbx.platform.typedef.u_int16_t = ushort
92
- rbx.platform.typedef.u_int32_t = uint
93
- rbx.platform.typedef.u_int64_t = ulong_long
94
- rbx.platform.typedef.u_int8_t = uchar
95
- rbx.platform.typedef.u_long = ulong
96
- rbx.platform.typedef.u_short = ushort
97
- rbx.platform.typedef.uid_t = ulong
98
- rbx.platform.typedef.uint = uint
99
37
  rbx.platform.typedef.uint16_t = ushort
100
- rbx.platform.typedef.uint32_t = uint
101
38
  rbx.platform.typedef.uint64_t = ulong_long
102
39
  rbx.platform.typedef.uint8_t = uchar
103
- rbx.platform.typedef.uint_fast16_t = uint
40
+ rbx.platform.typedef.uint_fast16_t = ushort
104
41
  rbx.platform.typedef.uint_fast32_t = uint
105
42
  rbx.platform.typedef.uint_fast64_t = ulong_long
106
43
  rbx.platform.typedef.uint_fast8_t = uchar
107
44
  rbx.platform.typedef.uint_least16_t = ushort
108
- rbx.platform.typedef.uint_least32_t = uint
109
45
  rbx.platform.typedef.uint_least64_t = ulong_long
110
46
  rbx.platform.typedef.uint_least8_t = uchar
111
47
  rbx.platform.typedef.uintmax_t = ulong_long
112
48
  rbx.platform.typedef.uintptr_t = ulong_long
113
- rbx.platform.typedef.ulong = ulong
114
- rbx.platform.typedef.useconds_t = ulong
115
- rbx.platform.typedef.ushort = ushort
116
- rbx.platform.typedef.vm_offset_t = ulong
117
- rbx.platform.typedef.vm_size_t = ulong
49
+ rbx.platform.typedef.useconds_t = uint
118
50
  rbx.platform.typedef.wchar_t = ushort
119
51
  rbx.platform.typedef.wctype_t = ushort
120
- rbx.platform.typedef.wint_t = uint
52
+ rbx.platform.typedef.wint_t = ushort
data/lib/ffi/pointer.rb CHANGED
@@ -31,17 +31,24 @@
31
31
  #
32
32
 
33
33
  require 'ffi/platform'
34
+
35
+ # NOTE: all method definitions in this file are conditional on
36
+ # whether they are not already defined. This is needed because
37
+ # some Ruby implementations (e.g., TruffleRuby) might already
38
+ # provide these methods due to using FFI internally, and we
39
+ # should not override them to avoid warnings.
40
+
34
41
  module FFI
35
42
  class Pointer
36
43
 
37
44
  # Pointer size
38
- SIZE = Platform::ADDRESS_SIZE / 8
45
+ SIZE = Platform::ADDRESS_SIZE / 8 unless const_defined?(:SIZE)
39
46
 
40
47
  # Return the size of a pointer on the current platform, in bytes
41
48
  # @return [Numeric]
42
49
  def self.size
43
50
  SIZE
44
- end
51
+ end unless respond_to?(:size)
45
52
 
46
53
  # @param [nil,Numeric] len length of string to return
47
54
  # @return [String]
@@ -54,7 +61,7 @@ module FFI
54
61
  else
55
62
  get_string(0)
56
63
  end
57
- end
64
+ end unless method_defined?(:read_string)
58
65
 
59
66
  # @param [Numeric] len length of string to return
60
67
  # @return [String]
@@ -64,7 +71,7 @@ module FFI
64
71
  # ptr.read_string(len) # with len not nil
65
72
  def read_string_length(len)
66
73
  get_bytes(0, len)
67
- end
74
+ end unless method_defined?(:read_string_length)
68
75
 
69
76
  # @return [String]
70
77
  # Read pointer's contents as a string.
@@ -73,7 +80,7 @@ module FFI
73
80
  # ptr.read_string # with no len
74
81
  def read_string_to_null
75
82
  get_string(0)
76
- end
83
+ end unless method_defined?(:read_string_to_null)
77
84
 
78
85
  # @param [String] str string to write
79
86
  # @param [Numeric] len length of string to return
@@ -84,7 +91,7 @@ module FFI
84
91
  # ptr.write_string(str, len) # with len not nil
85
92
  def write_string_length(str, len)
86
93
  put_bytes(0, str, 0, len)
87
- end
94
+ end unless method_defined?(:write_string_length)
88
95
 
89
96
  # @param [String] str string to write
90
97
  # @param [Numeric] len length of string to return
@@ -95,7 +102,7 @@ module FFI
95
102
  len = str.bytesize unless len
96
103
  # Write the string data without NUL termination
97
104
  put_bytes(0, str, 0, len)
98
- end
105
+ end unless method_defined?(:write_string)
99
106
 
100
107
  # @param [Type] type type of data to read from pointer's contents
101
108
  # @param [Symbol] reader method to send to +self+ to read +type+
@@ -113,7 +120,7 @@ module FFI
113
120
  tmp += size unless j == length-1 # avoid OOB
114
121
  }
115
122
  ary
116
- end
123
+ end unless method_defined?(:read_array_of_type)
117
124
 
118
125
  # @param [Type] type type of data to write to pointer's contents
119
126
  # @param [Symbol] writer method to send to +self+ to write +type+
@@ -129,12 +136,12 @@ module FFI
129
136
  self.send(writer, i * size, val)
130
137
  }
131
138
  self
132
- end
139
+ end unless method_defined?(:write_array_of_type)
133
140
 
134
141
  # @return [self]
135
142
  def to_ptr
136
143
  self
137
- end
144
+ end unless method_defined?(:to_ptr)
138
145
 
139
146
  # @param [Symbol,Type] type of data to read
140
147
  # @return [Object]
@@ -144,7 +151,7 @@ module FFI
144
151
  # ptr.get(type, 0)
145
152
  def read(type)
146
153
  get(type, 0)
147
- end
154
+ end unless method_defined?(:read)
148
155
 
149
156
  # @param [Symbol,Type] type of data to read
150
157
  # @param [Object] value to write
@@ -155,6 +162,6 @@ module FFI
155
162
  # ptr.put(type, 0)
156
163
  def write(type, value)
157
164
  put(type, 0, value)
158
- end
165
+ end unless method_defined?(:write)
159
166
  end
160
167
  end