summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-10-21 18:32:54 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-10-21 18:32:54 (GMT)
commit3da1bdd7794af6f2179dc7a61d3358fd33578d2f (patch)
tree8bc1b8b2a1f83ecc27b941257c9c0711f954136c
parent6b7189fe67176362caeb0a64936b14ff7783a30a (diff)
downloadtk-3da1bdd7794af6f2179dc7a61d3358fd33578d2f.zip
tk-3da1bdd7794af6f2179dc7a61d3358fd33578d2f.tar.gz
tk-3da1bdd7794af6f2179dc7a61d3358fd33578d2f.tar.bz2
Restore the use of -DTCL_NO_DEPRECATED when building Tk.
Without this, attempts to build with the latest Xcode tools fail because of a conflict between the long (long long long long) deprecated macro panic() from Tcl's header and a panic() prototype in the system mach.h file, which rides into the build on the tails of Cocoa.h
-rw-r--r--unix/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 1fde28d..d869528 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -186,7 +186,7 @@ KEYSYM_FLAGS =
# Tk does not used deprecated Tcl constructs so it should
# compile fine with -DTCL_NO_DEPRECATED. To remove its own
# set of deprecated code uncomment the second line.
-NO_DEPRECATED_FLAGS =
+NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED
#NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED
# Some versions of make, like SGI's, use the following variable to