Skip to content

Fix build with orc #4198

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

Merged
merged 1 commit into from
Oct 12, 2024
Merged

Fix build with orc #4198

merged 1 commit into from
Oct 12, 2024

Conversation

kleisauke
Copy link
Member

Regressed since 71d356b.

See: https://github.com/libvips/libvips/actions/runs/11304572685/job/31443113383

Details
In file included from /usr/include/orc-0.4/orc/orcprogram.h:7,
                 from /usr/include/orc-0.4/orc/orc.h:6,
                 from ../libvips/resample/reducev.cpp:80:
/usr/include/orc-0.4/orc/orcexecutor.h:42:8: error: redefinition of ‘struct _OrcExecutor’
   42 | struct _OrcExecutor {
      |        ^~~~~~~~~~~~
In file included from ../libvips/include/vips/vips.h:139,
                 from ../libvips/resample/reducev.cpp:71:
../libvips/include/vips/vips7compat.h:1665:16: note: previous definition of ‘struct _OrcExecutor’
 1665 | typedef struct _OrcExecutor {
      |                ^~~~~~~~~~~~
In file included from /usr/include/orc-0.4/orc/orc.h:6,
                 from ../libvips/resample/reducev.cpp:80:
/usr/include/orc-0.4/orc/orcprogram.h:27:8: error: redefinition of ‘struct _OrcProgram’
   27 | struct _OrcProgram {
      |        ^~~~~~~~~~~
In file included from ../libvips/include/vips/vips.h:139,
                 from ../libvips/resample/reducev.cpp:71:
../libvips/include/vips/vips7compat.h:1661:16: note: previous definition of ‘struct _OrcProgram’
 1661 | typedef struct _OrcProgram {
      |                ^~~~~~~~~~~

@kleisauke kleisauke marked this pull request as draft October 12, 2024 10:18
Regressed since 71d356b.
@kleisauke
Copy link
Member Author

@kleisauke kleisauke marked this pull request as ready for review October 12, 2024 10:28
@jcupitt jcupitt merged commit 59ac0f0 into libvips:master Oct 12, 2024
6 checks passed
@kleisauke kleisauke deleted the fix-build-with-orc branch October 12, 2024 11:36
kleisauke added a commit to kleisauke/libvips that referenced this pull request Oct 12, 2024
jcupitt pushed a commit that referenced this pull request Oct 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants