summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-10-01 15:48:27 +0000
committerKarl Berry <karl@freefriends.org>2007-10-01 15:48:27 +0000
commit627444251d8fb1d09ad491b3c49c929bdebe31a8 (patch)
tree5aef255d7702439edce54f97ba5199f9db553dd3
parentd4e31287b5927fa1b910e3142a9036526a895e85 (diff)
#undef floor for MacOSX
git-svn-id: svn://tug.org/texlive/trunk@5080 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/cpascal.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 4178c6af99b..e321f2a2567 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-01 Karl Berry <karl@tug.org>
+
+ * cpascal.h (floor): #undef, since MaxOSX #defines it.
+ From Peter Dyballa, metapost list, 27 Sep 2007 15:25:03.
+
2007-09-18 Karl Berry <karl@tug.org>
* tex.ch (29.530): Wording of "Type <return>" msg.
diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h
index b2cc4619848..ea71e72a298 100644
--- a/Build/source/texk/web2c/cpascal.h
+++ b/Build/source/texk/web2c/cpascal.h
@@ -48,6 +48,7 @@
#define odd(x) ((x) & 1)
#define round(x) zround ((double) (x))
#define trunc(x) ((integer) (x))
+#undef floor /* MacOSX */
#define floor(x) ((integer)floor((double)(x)))
#define input stdin
#define output stdout