Commit 78fd0ba
authored
Avoid collision with minor macro (bis) (#9526)
## Summary of Changes
minor is already used in `sys/types.h`
```
In file included from SFCGAL3/src/algorithm/surfaceSimplification.cpp:30:
In file included from CGAL-6.2/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h:22:
In file included from CGAL-6.2/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk.h:16:
In file included from CGAL-6.2/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/LindstromTurk_cost.h:17:
In file included from CGAL-6.2/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/Lindstrom_Turk_core.h:20:
In file included from CGAL-6.2/Surface_mesh_simplification/include/CGAL/Cartesian/MatrixC33.h:16:
CGAL-6.2/Surface_mesh_simplification/include/CGAL/internal/robust_cross_product.h:90:20: error: too many arguments provided to function-like macro invocation
90 | FT x = minor(uy, vy, uz, vz);
| ^
/usr/include/sys/types.h:337:9: note: macro 'minor' defined here
337 | #define minor(d) __minor(d)
| ^
```
[OpenBSD](https://github.com/openbsd/src/blob/master/sys/sys/types.h#L216)
[FreeBSD](https://github.com/freebsd/freebsd-src/blob/main/sys/sys/types.h#L337)
Reported by [SFCGAL
CI](https://github.com/SFCGAL/SFCGAL/actions/runs/27346692030/job/80797174200#step:3:241)
Reproduced locally (FreeBSD)
cc @ptitjano @landryb
## Release Management
* Affected package(s): Surface_mesh_simplification
* Issue(s) solved (if any): -
* Feature/Small Feature (if any): -
* License and copyright ownership: no change1 file changed
Lines changed: 4 additions & 4 deletions
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
91 | | - | |
92 | | - | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| |||
0 commit comments