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 2010/05/22 18:19:53 UTC
svn commit: r947314 - in /trafficserver/traffic/trunk: libinktomi++/ proxy/
proxy/mgmt2/ proxy/mgmt2/api2/ proxy/mgmt2/cli/ proxy/mgmt2/cluster/
proxy/mgmt2/preparse/ proxy/mgmt2/utils/ proxy/mgmt2/web2/
Author: zwoop
Date: Sat May 22 16:19:52 2010
New Revision: 947314
URL: http://svn.apache.org/viewvc?rev=947314&view=rev
Log:
Since ink_platform.h now requires ink_config.h to properly compile
on some platforms, I'm including ink_config.h there, and cleaning
out the the other includes. Feel free to change if this is not
appropriate, but this will fix build on FreeBSD at least (which
otherwise fails on ink_platform.h since it needs the defines from
ink_config.h).
Modified:
trafficserver/traffic/trunk/libinktomi++/Diags.cc
trafficserver/traffic/trunk/libinktomi++/ink_platform.h
trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
trafficserver/traffic/trunk/libinktomi++/inktomi++.h
trafficserver/traffic/trunk/libinktomi++/lockfile.cc
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/Plugin.cc
trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc
trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc
trafficserver/traffic/trunk/proxy/mgmt2/preparse/IPRange.cc
trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
Modified: trafficserver/traffic/trunk/libinktomi++/Diags.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Diags.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Diags.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/Diags.cc Sat May 22 16:19:52 2010
@@ -34,7 +34,6 @@
****************************************************************************/
-#include "ink_config.h"
#include "ink_unused.h"
#include "ink_error.h"
#include "ink_assert.h"
Modified: trafficserver/traffic/trunk/libinktomi++/ink_platform.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_platform.h?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_platform.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_platform.h Sat May 22 16:19:52 2010
@@ -24,6 +24,8 @@
#ifndef _ink_platform_h
#define _ink_platform_h
+#include "ink_config.h"
+
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
Modified: trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_res_init.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc Sat May 22 16:19:52 2010
@@ -67,7 +67,6 @@
#if !defined (_WIN32)
-#include "ink_config.h"
#include "ink_platform.h"
#include <sys/types.h>
Modified: trafficserver/traffic/trunk/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/inktomi%2B%2B.h?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/inktomi++.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/inktomi++.h Sat May 22 16:19:52 2010
@@ -37,8 +37,6 @@
#if !defined (_inktomiplus_h_)
#define _inktomiplus_h_
-#include "ink_config.h"
-
#ifdef __cplusplus
extern "C"
{
Modified: trafficserver/traffic/trunk/libinktomi++/lockfile.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/lockfile.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/lockfile.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/lockfile.cc Sat May 22 16:19:52 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_lockfile.h"
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Sat May 22 16:19:52 2010
@@ -30,6 +30,8 @@
****************************************************************************/
+#include "ink_config.h"
+
#include "inktomi++.h"
#if !defined(linux)
#include <sys/lock.h>
Modified: trafficserver/traffic/trunk/proxy/Plugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Plugin.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Plugin.cc (original)
+++ trafficserver/traffic/trunk/proxy/Plugin.cc Sat May 22 16:19:52 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_config.h"
#include <stdio.h>
// XXX: HP-UX ??? Not part of configure supported hosts
#if defined(hpux)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc Sat May 22 16:19:52 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h"
#include "Main.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc Sat May 22 16:19:52 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextManager.cc Sat May 22 16:19:52 2010
@@ -31,7 +31,6 @@
* Created by: Lan Tran
*
***************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "CfgContextManager.h"
#include "CfgContextUtils.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc Sat May 22 16:19:52 2010
@@ -29,7 +29,6 @@
*
***************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "Main.h"
#include "LocalManager.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/NetworkUtilsLocal.cc Sat May 22 16:19:52 2010
@@ -30,7 +30,6 @@
*
***************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_sock.h"
#include "Diags.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/FSM.cc Sat May 22 16:19:52 2010
@@ -28,7 +28,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc Sat May 22 16:19:52 2010
@@ -29,7 +29,6 @@
*
*/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/preparse/IPRange.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/preparse/IPRange.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/preparse/IPRange.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/preparse/IPRange.cc Sat May 22 16:19:52 2010
@@ -29,7 +29,6 @@
matching of a given IP address against those ranges.
****************************************************************************/
-#include "ink_config.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#if !defined (_WIN32)
#include <ctype.h>
Modified: trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc Sat May 22 16:19:52 2010
@@ -29,7 +29,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_string.h"
#include "ink_file.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc Sat May 22 16:19:52 2010
@@ -29,7 +29,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "IpLookup.h"
#include "DynArray.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc Sat May 22 16:19:52 2010
@@ -29,7 +29,6 @@
*
*/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc Sat May 22 16:19:52 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "ink_assert.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc Sat May 22 16:19:52 2010
@@ -28,7 +28,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "MgmtAllow.h"
#include "Main.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Sat May 22 16:19:52 2010
@@ -28,7 +28,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_hash_table.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc Sat May 22 16:19:52 2010
@@ -28,7 +28,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "TextBuffer.h"
#include "Main.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc Sat May 22 16:19:52 2010
@@ -21,7 +21,6 @@
limitations under the License.
*/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Sat May 22 16:19:52 2010
@@ -28,7 +28,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_hash_table.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc Sat May 22 16:19:52 2010
@@ -28,7 +28,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_resource.h"
#include "ink_hash_table.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc Sat May 22 16:19:52 2010
@@ -29,7 +29,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_hash_table.h"
#include "ink_rwlock.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc?rev=947314&r1=947313&r2=947314&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc Sat May 22 16:19:52 2010
@@ -28,7 +28,6 @@
*
****************************************************************************/
-#include "ink_config.h"
#include "ink_platform.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */