You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/02/27 23:20:05 UTC
git commit: TS-1123 Build problems with editline/readline on OSX
Updated Branches:
refs/heads/master dd93d7271 -> 1c8d02f6d
TS-1123 Build problems with editline/readline on OSX
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1c8d02f6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1c8d02f6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1c8d02f6
Branch: refs/heads/master
Commit: 1c8d02f6df0e8cbc917897d4f64fa3f7b4eeffea
Parents: dd93d72
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Feb 27 15:16:44 2012 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Feb 27 15:16:44 2012 -0700
----------------------------------------------------------------------
CHANGES | 5 +++++
mgmt/cli/cliAppInit.cc | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1c8d02f6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c348c29..5d4a3db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.3
+ *) [TS-1123] editline/readline conflicts when building on OSX.
+
+ *) [TS-1116] Fixes for building the source with clang/lvm.
+
+ *) [TS-1102] Cleanup of Diagnostics code. Author: Uri Shachar and Leif.
*) [TS-1117] Remove TS_HAS_PURIFY MACRO
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1c8d02f6/mgmt/cli/cliAppInit.cc
----------------------------------------------------------------------
diff --git a/mgmt/cli/cliAppInit.cc b/mgmt/cli/cliAppInit.cc
index 506a402..d59537f 100644
--- a/mgmt/cli/cliAppInit.cc
+++ b/mgmt/cli/cliAppInit.cc
@@ -58,11 +58,11 @@
#include <editline/readline.h>
#elif HAVE_READLINE_READLINE_H
#include <readline/readline.h>
-#endif
-
#if HAVE_READLINE_HISTORY_H
#include <readline/history.h>
#endif
+#endif
+
Tcl_Interp *interp;
extern Tcl_HashTable CommandHashtable;