-
Notifications
You must be signed in to change notification settings - Fork 849
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.
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
Fix conversion on various files #8135
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rebase+reconciliation needed.
CONFLICT (content): Merge conflict in src/tls.c
looks good otherwise.
a9e5938
to
172edaf
Compare
retest this please |
@gasbytes please share how you produced these conversion warnings. Which complier and what build steps. Thank you |
@gasbytes please squash. |
@dgarske
And this is the configuration, followed just by a
|
ced378f
to
e2b509a
Compare
Retest this please:
|
has a slew of conflicts relative to current
it's a mystery to me why github thinks "Merging can be performed automatically"... |
I think this might be because I resolved those conflicts using GitHub's web editor, but I'm not entirely sure why GitHub now says the merge can be performed automatically. As far as I can tell, those files don’t seem to have any breaking changes compared to master, so that might also be a reason. |
dec656c
to
4b0616a
Compare
Retest this please |
4b0616a
to
c98e06e
Compare
Retest this please |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great! A rebase error snuck in -- see note, re src/ssl.c
around line 21948.
c98e06e
to
9178c53
Compare
Retest this please |
These ones were linux specific (x86_64 on Void Linux).
Most of them were automated using a shell script that I wrote locally, that uses a vim interactive shell.
Working on the next block of files.
Testing: "gcc (GCC) 13.2.0"