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

r.flow: rename io.h file which causes conflict with MSYS2 #3708

Merged
merged 1 commit into from
May 14, 2024
Merged

r.flow: rename io.h file which causes conflict with MSYS2 #3708

merged 1 commit into from
May 14, 2024

Conversation

nilason
Copy link
Contributor

@nilason nilason commented May 14, 2024

Rename r.flow file io.h, which causes conflict with MSYS2.

Closes: #3700

@nilason nilason added this to the 8.4.0 milestone May 14, 2024
@nilason nilason added the bug Something isn't working label May 14, 2024
@github-actions github-actions bot added raster Related to raster data processing C Related code is in C module labels May 14, 2024
@nilason nilason added the windows Microsoft Windows specific label May 14, 2024
@nilason nilason self-assigned this May 14, 2024
@nilason nilason enabled auto-merge (squash) May 14, 2024 10:26
echoix
echoix approved these changes May 14, 2024
View reviewed changes
Copy link
Member

@echoix echoix left a comment

Choose a reason for hiding this comment

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

Way better solution! I knew something was wrong and I didn't really believe that it was only a missing include after trying to create the error in Linux. I didn't think of that avenue yet.

@nilason nilason merged commit 0ec833c into OSGeo:main May 14, 2024
26 checks passed
neteler pushed a commit that referenced this pull request May 14, 2024
@nilason @neteler
r.flow: rename io.h file which causes conflict with MSYS2 (#3708)
30f4c87 
Closes: #3700
@nilason nilason deleted the fix_win_ci_failure branch May 15, 2024 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@echoix echoix echoix approved these changes

Assignees

@nilason nilason

Labels
bug Something isn't working C Related code is in C module raster Related to raster data processing windows Microsoft Windows specific
Projects
None yet
Milestone
8.4.0
Development

Successfully merging this pull request may close these issues.

[Bug] Windows CI builds fail to compile r.flow
2 participants
@nilason @echoix