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:
Sean Cross
2023-03-10 11:07:55 -05:00
committed by Tim Edwards
parent 5e5879c53d
commit 1e7da74672
14 changed files with 69 additions and 69 deletions
+1 -1
View File
@@ -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 */