From b4cd3fdae60e92f33157486b0b0741af5bac9bf0 Mon Sep 17 00:00:00 2001 From: clean Date: Tue, 15 May 2001 11:20:03 +0000 Subject: commit from pc after merge on mac (not tested) git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@431 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d --- backendC/CleanCompilerSources/system.h | 10 ++++++---- backendC/CleanCompilerSources/types.t | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'backendC/CleanCompilerSources') diff --git a/backendC/CleanCompilerSources/system.h b/backendC/CleanCompilerSources/system.h index d200b95..c03ef56 100644 --- a/backendC/CleanCompilerSources/system.h +++ b/backendC/CleanCompilerSources/system.h @@ -6,13 +6,15 @@ */ #define _SYSTEM_ -#undef _WINDOWS_ -#if defined (applec) || (defined (__MWERKS__) && !defined (_WINDOWS_)) || defined (__MRC__) +#if defined (__MWERKS__) && defined (_X86_) +# define _WINDOWS_ +#endif + +#if defined (applec) || (defined (__MWERKS__) && !defined (_X86_)) || defined (__MRC__) # define _MAC_ # define _STANDALONE_ - -#define __ppc__ +# define __ppc__ #elif defined (THINK_C) # define _MACUSER_ diff --git a/backendC/CleanCompilerSources/types.t b/backendC/CleanCompilerSources/types.t index 9a58e36..59a1770 100644 --- a/backendC/CleanCompilerSources/types.t +++ b/backendC/CleanCompilerSources/types.t @@ -2,9 +2,11 @@ #if !defined (_THE__TYPES_) #define _THE__TYPES_ -#undef _WINDOWS_ +#if defined (__MWERKS__) && defined (_X86_) +# define _WINDOWS_ +#endif -#if (defined (__MWERKS__) && !defined (_WINDOWS_)) || defined (__MRC__) +#if (defined (__MWERKS__) && !defined (_X86_)) || defined (__MRC__) # define POWER 1 #endif -- cgit v1.2.3