mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-08-29 09:30:46 +02:00
rename Region to ExtRegion
On Macos, Tk includes X11, which has this define:
#if !defined(MAC_OSX_TK)
# include <X11/X.h>
#endif
#ifdef MAC_OSX_TK
# include <X11/X.h>
# define Cursor XCursor
# define Region XRegion
#endif
This causes the keywords `Cursor` and `Region` to be reserved, which
prevents magic from building.
Rename `Region` to `ExtRegion` as suggested by @RTimothyEdwards in
https://github.com/RTimothyEdwards/magic/issues/195#issuecomment-1298870983
and https://github.com/RTimothyEdwards/magic/pull/222#pullrequestreview-1334900670
Signed-off-by: Sean Cross <[email protected]>
This commit is contained in:
+1
-1
@@ -48,7 +48,7 @@ typedef struct nlTermLoc
|
||||
struct chan *nloc_chan; /* Contains nloc_stem */
|
||||
struct pin *nloc_pin; /* Pin on nloc_chan boundary */
|
||||
|
||||
struct region *nloc_region; /* Region containing stem */
|
||||
struct region *nloc_region; /* ExtRegion containing stem */
|
||||
struct czone *nloc_czone; /* Range containing point */
|
||||
int nloc_stemcost; /* Cost of stem */
|
||||
int nloc_flags; /* Flags */
|
||||
|
||||
Reference in New Issue
Block a user