summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@noemail.net>2014-10-21 18:32:54 (GMT)
committerdgp <dgp@noemail.net>2014-10-21 18:32:54 (GMT)
commit89a40ffbc839c9b3f2aecd19d7a8a396d7a0ba23 (patch)
tree8bc1b8b2a1f83ecc27b941257c9c0711f954136c
parent6fdcdc323916848fb9c372bee4fa673caf84c32a (diff)
downloadtk-89a40ffbc839c9b3f2aecd19d7a8a396d7a0ba23.zip
tk-89a40ffbc839c9b3f2aecd19d7a8a396d7a0ba23.tar.gz
tk-89a40ffbc839c9b3f2aecd19d7a8a396d7a0ba23.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 FossilOrigin-Name: 453a3beb37853ba4a9cea41d3d7413b475756baf
-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