From e980af9b910321e2efcd2699b63217baff7f87ba Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Tue, 7 Dec 2021 20:10:37 +0100 Subject: [PATCH] build fixes for LaunchAPPL client --- LaunchAPPL/Client/Classic.cc | 9 ++++----- LaunchAPPL/Client/LaunchAPPL.cc | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/LaunchAPPL/Client/Classic.cc b/LaunchAPPL/Client/Classic.cc index 18a3deb94f..912a050cd0 100644 --- a/LaunchAPPL/Client/Classic.cc +++ b/LaunchAPPL/Client/Classic.cc @@ -1,11 +1,10 @@ -#define ResType MacResType -#include -#undef ResType - -#if TARGET_CPU_PPC +#ifdef __powerpc #include "Classic.h" #include "Launcher.h" +#define ResType MacResType +#include +#undef ResType namespace po = boost::program_options; diff --git a/LaunchAPPL/Client/LaunchAPPL.cc b/LaunchAPPL/Client/LaunchAPPL.cc index 32745a1446..0841a80871 100644 --- a/LaunchAPPL/Client/LaunchAPPL.cc +++ b/LaunchAPPL/Client/LaunchAPPL.cc @@ -9,10 +9,7 @@ #include "Launcher.h" #if defined(__APPLE__) -# define ResType MacResType -# include -# undef ResType -# if TARGET_CPU_PPC +# ifdef __powerpc # include "Classic.h" # endif # include "Carbon.h"