10
66
Fork
You've already forked fcft
14

Modified header file to allow for inclusion in C++ #61

Open
kpckpc wants to merge 3 commits from kpckpc/fcft:master into master
pull from: kpckpc/fcft:master
merge into: dnkl:master
dnkl:master
dnkl:colrv1
dnkl:releases/3.3
dnkl:rasterize-utf8
dnkl:spacing
dnkl:releases/3.2
dnkl:releases/3.1
dnkl:releases/3.0
dnkl:releases/2.5
dnkl:releases/2.4
dnkl:releases/2.3
dnkl:releases/2.2
dnkl:releases/2.1
dnkl:releases/2.0
dnkl:releases/1.0
First-time contributor
Copy link

Modified header file to allow for inclusion in C++
Although the [static len] and restrict allows for some compiler optimization, I performed some testing and no significant difference was observed in speed. Removed these options to allow inclusion into C++ files. Furthermore added the usual #ifdef __cplusplus checks.

Modified header file to allow for inclusion in C++ Although the [static len] and restrict allows for some compiler optimization, I performed some testing and no significant difference was observed in speed. Removed these options to allow inclusion into C++ files. Furthermore added the usual #ifdef __cplusplus checks.
Modified header file to allow for inclusion in C++
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
2daa54475f
added cap- and x-height to allow vertical centering
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
289c11438b
added example without wayland dependency
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
0de30495c3
Owner
Copy link

This PR does a lot more than adding C++ compatibility. Could you split out those to a separate PR?

This PR does a lot more than adding C++ compatibility. Could you split out those to a separate PR?
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
This pull request has changes conflicting with the target branch.
  • fcft/fcft.h
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u master:kpckpc-master
git switch kpckpc-master

Merge

Merge the changes and update on Forgejo.
git switch master
git merge --no-ff kpckpc-master
git switch kpckpc-master
git rebase master
git switch master
git merge --ff-only kpckpc-master
git switch kpckpc-master
git rebase master
git switch master
git merge --no-ff kpckpc-master
git switch master
git merge --squash kpckpc-master
git switch master
git merge --ff-only kpckpc-master
git switch master
git merge kpckpc-master
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
dnkl/fcft!61
Reference in a new issue
dnkl/fcft
No description provided.
Delete branch "kpckpc/fcft:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?