From 91387d887b4a4dfbbf23f2ee00a24b94bebd887c Mon Sep 17 00:00:00 2001 From: Rowan Walshe Date: Fri, 4 Aug 2023 14:29:11 +0100 Subject: [PATCH] Wrap external parameter OS with SPAWN_OS, as OS can clash with other projects --- gnat/spawn.gpr | 2 +- gnat/spawn_glib.gpr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnat/spawn.gpr b/gnat/spawn.gpr index 9d814be..f266eb1 100644 --- a/gnat/spawn.gpr +++ b/gnat/spawn.gpr @@ -9,7 +9,7 @@ with "../config/spawn_config.gpr"; library project Spawn is type OS_API_Kind is ("unix", "osx", "Windows_NT"); - OS_API : OS_API_Kind := external ("OS", "unix"); + OS_API : OS_API_Kind := external ("SPAWN_OS", external ("OS", "unix")); type Library_Kind is ("static", "static-pic", "relocatable"); Library_Type : Library_Kind := diff --git a/gnat/spawn_glib.gpr b/gnat/spawn_glib.gpr index f12701c..c438df6 100644 --- a/gnat/spawn_glib.gpr +++ b/gnat/spawn_glib.gpr @@ -10,7 +10,7 @@ with "../config/spawn_config.gpr"; library project Spawn_Glib is type OS_API_Kind is ("unix", "osx", "Windows_NT"); - OS_API : OS_API_Kind := external ("OS", "unix"); + OS_API : OS_API_Kind := external ("SPAWN_OS", external ("OS", "unix")); type Library_Kind is ("static", "static-pic", "relocatable"); Library_Type : Library_Kind :=