Skip to content

Commit

Permalink
Fix conflict between orc.h and vips7compat.h
Browse files Browse the repository at this point in the history
  • Loading branch information
kleisauke committed Oct 17, 2024
1 parent a697fe7 commit cdf0096
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion libvips/include/vips/vips7compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,24 @@

#include <vips/mask.h>

/* The old deprecated VipsVector/VipsExecutor API required orc.
/* The deprecated VipsVector/VipsExecutor API was required by orc.
* Avoid a possible ABI/API break with the adoption of highway.
*/
#ifdef HAVE_ORC
#include <orc/orc.h>
#else
#ifndef _ORC_PROGRAM_H_
typedef struct _OrcProgram {
/* Opaque */
} OrcProgram;
#endif

#ifndef _ORC_EXECUTOR_H_
typedef struct _OrcExecutor {
char data[808];
} OrcExecutor;
#endif
#endif /* HAVE_ORC */

#ifdef __cplusplus
extern "C" {
Expand Down

0 comments on commit cdf0096

Please sign in to comment.