about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2005-01-12 16:34:31 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2005-01-12 16:34:31 +0000
commitdf7ffd2999fc203da08777f00138f03667b61c2a (patch)
treec53022bbc1dfaf137972505f31b624701667c4d2
parent21c0b276135a7fd58b25abc61fcdcb171bec2fcd (diff)
downloadzsh-df7ffd2999fc203da08777f00138f03667b61c2a.tar.gz
zsh-df7ffd2999fc203da08777f00138f03667b61c2a.tar.xz
zsh-df7ffd2999fc203da08777f00138f03667b61c2a.zip
20701: fix compilation on Mac OS X: define is __APPLE__, not APPLE
-rw-r--r--ChangeLog12
-rw-r--r--Src/system.h2
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d0325ff68..4ed4eda39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-12  Oliver Kiddle  <opk@zsh.org>
+
+	* 20701: Src/system.h: fix compilation on Mac OS X
+
 2005-01-12  Peter Stephenson  <pws@csr.com>
 
 	* users/8354: Doc/Zsh/options.yo: with glob_complete, completing
@@ -19,7 +23,7 @@
 	* 20692: Test/ztst.zsh: having POSIXLY_CORRECT set makes
 	GNU tail report warning with -<NUM>.
 
-2004-01-11  Clint Adams  <clint@zsh.org>
+2005-01-11  Clint Adams  <clint@zsh.org>
 
 	* unposted: config.guess, config.sub: update to 2004-11-12 and
 	2004-11-30, respectively.
@@ -46,7 +50,7 @@
 	creating an unnecessary multio if a later redirect re-opens that
 	descriptor.
 
-2004-01-10  Clint Adams  <clint@zsh.org>
+2005-01-10  Clint Adams  <clint@zsh.org>
 
 	* 20665: Completion/Unix/Command/_gnome-gv,
 	Completion/Unix/Type/_pspdf: improve completion for
@@ -61,7 +65,7 @@
 
 	* 20662: Completion/X/Command/_nedit: update for nedit 5.5
 
-2004-01-09  Clint Adams  <clint@zsh.org>
+2005-01-09  Clint Adams  <clint@zsh.org>
 
 	* 20655: Completion/Debian/Type/_deb_packages:
 	_deb_packages fix from Karl Chen.
@@ -71,7 +75,7 @@
 	Completion/Debian/Type/_deb_packages: completion for wajig, and
 	dpkg/deb_packages improvements from Karl Chen.
 
-2004-01-07  Clint Adams  <clint@zsh.org>
+2005-01-07  Clint Adams  <clint@zsh.org>
 
 	* 20650: Completion/Unix/Command/_mencal:
 	completion for mencal.
diff --git a/Src/system.h b/Src/system.h
index 1c1de8da3..ccb125088 100644
--- a/Src/system.h
+++ b/Src/system.h
@@ -681,7 +681,7 @@ extern short ospeed;
 # define IS_DIRSEP(c) ((c) == '/')
 #endif
 
-#if defined(__GNUC__) && !defined(APPLE)
+#if defined(__GNUC__) && !defined(__APPLE__)
 /* Does the OS X port of gcc still gag on __attribute__? */
 #define UNUSED(x) x __attribute__((__unused__))
 #else