Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 96d7271

Browse filesBrowse files
committed
Enable MRB_METHOD_T_STRUCT by default on 32bit Windows
Because we can't use the highest 2 bits of function pointers.
1 parent be86bd3 commit 96d7271
Copy full SHA for 96d7271

2 files changed

+14-1Lines changed: 14 additions & 1 deletion

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎appveyor.yml‎

Copy file name to clipboardExpand all lines: appveyor.yml
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,18 @@ environment:
1414
# Visual Studio 2017 64bit
1515
- visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat
1616

17+
# Visual Studio 2017 32bit
18+
- visualcpp: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
19+
machine: x86
20+
1721
# Visual Studio 2015 64bit
1822
- visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
1923
machine: amd64
2024

25+
# Visual Studio 2015 32bit
26+
- visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
27+
machine: x86
28+
2129
# Visual Studio 2013 64bit
2230
- visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
2331
machine: amd64
Collapse file

‎include/mrbconf.h‎

Copy file name to clipboardExpand all lines: include/mrbconf.h
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@
3838

3939
/* add -DMRB_METHOD_T_STRUCT on machines that use higher bits of pointers */
4040
/* no MRB_METHOD_T_STRUCT requires highest 2 bits of function pointers to be zero */
41-
//#define MRB_METHOD_T_STRUCT
41+
#ifndef MRB_METHOD_T_STRUCT
42+
// can't use highest 2 bits of function pointers on 32bit Windows.
43+
# if defined(_WIN32) && !defined(_WIN64)
44+
# define MRB_METHOD_T_STRUCT
45+
# endif
46+
#endif
4247

4348
/* add -DMRB_INT32 to use 32bit integer for mrb_int; conflict with MRB_INT64;
4449
Default for 32-bit CPU mode. */

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.