From 5b3c952fe9566ef0b7417755e697a7942f00c3ba Mon Sep 17 00:00:00 2001 From: Patrik Weiskircher Date: Thu, 31 Mar 2005 20:37:59 +0000 Subject: [PATCH] Added new define SILC_MACOSX, if __APPLE__ and __MACH__ is defined. bool is defined as _Bool on Mac OS X now. --- CHANGES | 8 ++++++++ includes/silcincludes.h.in | 6 ++++++ lib/silcutil/silctypes.h | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/CHANGES b/CHANGES index 15befc32..b9917fd4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +Thu Mar 31 22:34:22 CEST 2005 Patrik Weiskircher + + * Added new define SILC_MACOSX, if __APPLE__ and __MACH__ is defined. + Affected file: includes/silcincludes.h.in + + * bool is defined as _Bool on Mac OS X now. + Affected file: lib/silcutil/silctypes.h + Thu Mar 31 08:52:06 EEST 2005 Pekka Riikonen * Added support for UTF-8 nicknames, channel names and diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in index 3bc14ca5..8b56bf4b 100644 --- a/includes/silcincludes.h.in +++ b/includes/silcincludes.h.in @@ -63,6 +63,12 @@ extern "C" { #endif #endif +#if defined(__MACH__) && defined(__APPLE__) +#ifndef SILC_MACOSX +#define SILC_MACOSX +#endif +#endif + /* Types */ #define SILC_SIZEOF_LONG_LONG @SILC_SIZEOF_LONG_LONG@ #define SILC_SIZEOF_LONG @SILC_SIZEOF_LONG@ diff --git a/lib/silcutil/silctypes.h b/lib/silcutil/silctypes.h index 1b016eda..e98bc8c8 100644 --- a/lib/silcutil/silctypes.h +++ b/lib/silcutil/silctypes.h @@ -79,6 +79,10 @@ * * SOURCE */ +#ifdef SILC_MACOSX +#define bool _Bool +#endif + #ifndef __cplusplus #ifndef bool #define bool unsigned char -- 2.43.0