Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix building on OS X (see #122) #123

Closed
wants to merge 1 commit into from
Closed

Fix building on OS X (see #122) #123

wants to merge 1 commit into from

Conversation

otaran
Copy link
Contributor

@otaran otaran commented Nov 28, 2015

No description provided.

otaran
otaran reviewed Nov 28, 2015
View reviewed changes
re2c/src/parse/parser.ypp
@@ -159,7 +159,7 @@ void default_rule(CondList *clist, const Code * code)

%token CLOSE
%token CLOSESIZE
%token CODE
%token TOKEN_CODE
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed this to TOKEN_CODE because it would produce #define CODE ... which in turn would collide with other declarations like opt_t::CODE or OutputFragment::CODE.

@otaran otaran mentioned this pull request Nov 28, 2015
Closed
@skvadrik skvadrik self-assigned this Nov 28, 2015
@skvadrik skvadrik added this to the 0.15.3 milestone Nov 28, 2015
@skvadrik
Copy link
Owner

Pulled your fix, thanks! See this commit: c172f26

I had to tune it a bit. The fix in re2c/src/util/u32lim.h actually fixes OS X builds, but breaks builds on my platform: since size_t is the same as uint64_t, overloaded constructor is invalid (you cannot make two different overloads for the same type). I'll fix it by dropping overloaded constructor in favour of static constructor-like methods with different names.

@skvadrik
Copy link
Owner

Fixed re2c/src/util/u32lim.h (overloaded constructor resolution) in this commit: f65caba

@skvadrik skvadrik closed this Nov 28, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@skvadrik skvadrik

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@otaran @skvadrik