Added new define SILC_MACOSX, if __APPLE__ and __MACH__ is defined.

	bool is defined as _Bool on Mac OS X now.

diff --git a/CHANGES b/CHANGES
index 15befc32498650fd2fb664317dea83c55e383e6b..b9917fd484d06db95d9615526a596ae3ba2c66de 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+Thu Mar 31 22:34:22 CEST 2005  Patrik Weiskircher <pat@icore.at>
+
+       * 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 <priikone@silcnet.org>
 
        * Added support for UTF-8 nicknames, channel names and

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 3bc14ca536415a02c4b915a087a7be80aad2d1ef..8b56bf4b8bf8072b6d7cda2e87526cbff878b319 100644 (file)
--- 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 1b016edabcba89ba6af473a34ea3fa4676d3cbbd..e98bc8c82bdf47f18a85b4f0a4f7a1d0a9df2897 100644 (file)
--- 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