You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/22 15:51:14 UTC
svn commit: r947296 [2/2] - in /trafficserver/traffic/trunk: ./ iocore/aio/
iocore/block-cache/ iocore/cache/ iocore/cluster/ iocore/dns/
iocore/eventsystem/ iocore/fastio/include/ iocore/fastio/libfastIO/
iocore/fastio/tools/NewUdpSend/ iocore/hostdb/...
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc Sat May 22 13:51:11 2010
@@ -2883,7 +2883,7 @@ char *
get_rmserver_path()
{
char *path = NULL;
-#if (HOST_OS == linux)
+#if defined(linux)
FILE *rec_file;
int i = 0, num_args = 0;
@@ -2932,7 +2932,7 @@ get_rmserver_path()
inkapi INKError rm_change_ip(int cnt, char **ip)
{
-#if (HOST_OS == linux)
+#if defined(linux)
int status;
char rmserver_path[512], rmserver_path1[512];
@@ -3030,7 +3030,7 @@ inkapi INKError rm_change_ip(int cnt, ch
inkapi INKError rm_remove_ip(int cnt, char **ip)
{
-#if (HOST_OS == linux)
+#if defined(linux)
int i, status, flag;
char rmserver_path[512], rmserver_path1[512];
@@ -3127,7 +3127,7 @@ inkapi INKError rm_remove_ip(int cnt, ch
inkapi INKError rm_change_hostname(INKString hostname)
{
-#if (HOST_OS == linux)
+#if defined(linux)
char rmserver_path[512], rmserver_path1[512];
char buf[1024], temp[512];
@@ -3284,7 +3284,7 @@ closeAllFds()
inkapi INKError rm_start_proxy()
{
-#if (HOST_OS == linux)
+#if defined(linux)
static time_t rm_last_stop = 0;
time_t time_diff = time(NULL) - rm_last_stop;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h Sat May 22 13:51:11 2010
@@ -53,12 +53,12 @@
#define inkimp
#endif
-#if (HOST_OS != linux)
+#if !defined(linux)
#if defined (__SUNPRO_CC) || (defined (__GNUC__) || ! defined(__cplusplus))
#if !defined (bool)
-#if (HOST_OS != darwin) && (HOST_OS != freebsd) && (HOST_OS != solaris)
+#if !defined(darwin) && !defined(freebsd) && !defined(solaris)
#define bool int
#endif
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc Sat May 22 13:51:11 2010
@@ -156,7 +156,7 @@ ts_connect()
memset(&client_sock, 0, sizeof(sockaddr_un));
client_sock.sun_family = AF_UNIX;
ink_strncpy(client_sock.sun_path, main_socket_path, sizeof(client_sock.sun_path));
-#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(darwin) || defined(freebsd)
sockaddr_len = sizeof(sockaddr_un);
#else
sockaddr_len = sizeof(client_sock.sun_family) + strlen(client_sock.sun_path);
@@ -181,7 +181,7 @@ ts_connect()
memset(&client_event_sock, 0, sizeof(sockaddr_un));
client_event_sock.sun_family = AF_UNIX;
ink_strncpy(client_event_sock.sun_path, event_socket_path, sizeof(client_sock.sun_path));
-#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(darwin) || defined(freebsd)
sockaddr_len = sizeof(sockaddr_un);
#else
sockaddr_len = sizeof(client_event_sock.sun_family) + strlen(client_event_sock.sun_path);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc Sat May 22 13:51:11 2010
@@ -132,7 +132,7 @@ clientCLI::CliResult clientCLI::connectT
memset(&clientS, 0, sizeof(sockaddr_un));
clientS.sun_family = AF_UNIX; // UNIX domain socket
ink_strncpy(clientS.sun_path, sockPath, sizeof(clientS.sun_path));
-#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(darwin) || defined(freebsd)
sockaddrLen = sizeof(sockaddr_un);
#else
sockaddrLen = sizeof(clientS.sun_family) + strlen(clientS.sun_path);;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Sat May 22 13:51:11 2010
@@ -4499,7 +4499,7 @@ IsValidDomainname(char *str)
int
getnameserver(char *nameserver, int len)
{
-#if (HOST_OS == linux)
+#if defined(linux)
char buff[256];
FILE *fstr;
if ((fstr = fopen(NAMESERVER_PATH, "r")) == NULL)
@@ -4527,7 +4527,7 @@ getnameserver(char *nameserver, int len)
}
-#if (HOST_OS == solaris)
+#if defined(solaris)
/*
* NOTE: This routine is found in libnsl (-lnsl). No prototype was found in
* any of the header files in /usr/include. Define a prototype here to keep the
@@ -4543,7 +4543,7 @@ setnameserver(char *nameserver)
if ((fstr = fopen(NAMESERVER_PATH, "wb")) == NULL) {
return -1;
} else {
-#if (HOST_OS == linux) || (HOST_OS == darwin) || (HOST_OS == freebsd) //FIXME: solaris
+#if defined(linux) || defined(darwin) || defined(freebsd) //FIXME: solaris
char domain[256];
char resolventry[256];
@@ -4578,7 +4578,7 @@ int
getrouter(char *router, int len)
{
FILE *fstr;
-#if (HOST_OS == linux) || (HOST_OS == darwin) || (HOST_OS == freebsd) || (HOST_OS == solaris)
+#if defined(linux) || defined(darwin) || defined(freebsd) || defined(solaris)
char buff[256];
char *p;
@@ -4623,13 +4623,13 @@ int
getnetparms(char *ipnum, char *mask)
{
#define BUFFLEN 256
-#if (HOST_OS == linux)
+#if defined(linux)
#define interface_name "eth0"
-#elif (HOST_OS == darwin)
+#elif defined(darwin)
#define interface_name "en0"
-#elif (HOST_OS == freebsd)
+#elif defined(freebsd)
#define interface_name "eth0"
-#elif (HOST_OS == solaris)
+#elif defined(solaris)
#define interface_name "e1000g0" // FIXME: better way to get interface names
#endif
@@ -4659,7 +4659,7 @@ getnetparms(char *ipnum, char *mask)
fprintf(stderr, "me lines over %d characters long.\n", BUFFLEN);
goto err;
}
-#if (HOST_OS == linux) || (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(linux) || defined(darwin) || defined(freebsd)
p = pos_after_string(buff, "inet addr:");
#endif
@@ -5709,7 +5709,7 @@ find_value(const char *pathname, const c
int find = 0;
int counter = 0;
-#if (HOST_OS == linux) || (HOST_OS == darwin) || (HOST_OS == freebsd) || (HOST_OS == solaris)
+#if defined(linux) || defined(darwin) || defined(freebsd) || defined(solaris)
ink_strncpy(value, "", value_len);
// coverity[fs_check_call]
if (access(pathname, R_OK)) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h Sat May 22 13:51:11 2010
@@ -821,7 +821,7 @@ int IsValidFQHostname(char *str);
int IsValidDomainname(char *str);
int IsValidIpAddress(char *str);
int getnetparms(char *ipaddr, char *netmask);
-#if (HOST_OS == solaris)
+#if defined(solaris)
int getnetmask(char *mask);
#endif
char *pos_after_string(char const *haystack, char const *needle);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_scriptpaths.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_scriptpaths.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_scriptpaths.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_scriptpaths.h Sat May 22 13:51:11 2010
@@ -28,7 +28,7 @@
#define __SPI_SCRIPT_PATH__H
#define INKTOMI_HOME "/home/inktomi"
-#if (HOST_OS == solaris)
+#if defined(solaris)
#define DEFAULTROUTER_PATH "/etc/defaultrouter"
#define DEFAULT_DOMAIN_PATH "/etc/defaultdomain"
#define NETMASK_PATH "/etc/inet/netmasks"
@@ -42,7 +42,7 @@
#define SET_ROUTER_SCRIPT "./cli_setrouter.tcl"
#define GATEWAY_MARKER "GATEWAY=" // FIXME:
-#elif (HOST_OS == linux)
+#elif defined(linux)
#define DEFAULTROUTER_PATH "/etc/sysconfig/network"
#define DEFAULT_DOMAIN_PATH "/etc/sysconfig/network"
#define DEFAULT_NAMESERVER_PATH "/etc/resolv.conf"
@@ -54,10 +54,10 @@
#define NIC_IDENTIFIER_STRING "eth0"
#define NIC_CHANGES_STRING "Changes Take Effect Immediately"
#define NIC_SETTINGS_EXECUTABLE INKTOMI_HOME "/rubicon/bin/mii-diag"
-#elif (HOST_OS == darwin)
+#elif defined(darwin)
#define DEFAULTROUTER_PATH "/tmp/tsrouterpath-fixme" // FIXME:
#define GATEWAY_MARKER "GATEWAY=" // FIXME:
-#elif (HOST_OS == freebsd)
+#elif defined(freebsd)
#define DEFAULTROUTER_PATH "/tmp/tsrouterpath-fixme" // FIXME:
#define GATEWAY_MARKER "GATEWAY=" // FIXME:
#endif
@@ -108,13 +108,13 @@
#define SET_TIMEZONE_SCRIPT INKTOMI_HOME "/rubicon/bin/spi_settimezone.sh"
#define SET_TIMEZONE_ARGS "1>/usr/tmp/spi_settimezone.log 2>&1"
-#if (HOST_OS == solaris)
+#if defined(solaris)
#define TIMEZONE_FILE "/etc/default/init"
-#elif (HOST_OS == linux)
+#elif defined(linux)
#define TIMEZONE_FILE "/etc/sysconfig/clock"
-#elif (HOST_OS == darwin)
+#elif defined(darwin)
#define TIMEZONE_FILE "/tmp/tstzonefile-fixme" // FIXME:
-#elif (HOST_OS == freebsd)
+#elif defined(freebsd)
#define TIMEZONE_FILE "/tmp/tstzonefile-fixme" // FIXME:
#else
#error No file set for this OS.
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc Sat May 22 13:51:11 2010
@@ -2551,7 +2551,7 @@ checkBackDoor(int req_fd, char *message)
mgmt_writeline(req_fd, reply, strlen(reply));
#if !defined(_WIN32)
-#if (HOST_OS == solaris)
+#if defined(solaris)
snprintf(reply, sizeof(reply), "\twatched_process_fd: %d watched_process_pid: %ld\n",
lmgmt->watched_process_fd, lmgmt->watched_process_pid);
#else
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/VMap.cc Sat May 22 13:51:11 2010
@@ -242,7 +242,7 @@ VMap::VMap(char *interface, unsigned lon
}
}
}
-#if (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(freebsd) || defined(darwin)
ifr = (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len);
#else
ifr = (struct ifreq *) (((char *) ifr) + sizeof(*ifr));
@@ -1092,7 +1092,7 @@ VMap::upAddr(char *virt_ip)
interface = ((VIPInfo *) hash_value)->interface;
sub_id = ((VIPInfo *) hash_value)->sub_interface_id;
-#if (HOST_OS == linux) || (HOST_OS == freebsd) || (HOST_OS == solaris) || (HOST_OS == darwin)
+#if defined(linux) || defined(freebsd) || defined(solaris) || defined(darwin)
res = execl(absolute_vipconf_binary, vip_conf, "up", virt_ip, "/sbin/ifconfig", interface, sub_id, (char*) NULL);
#else
res = execl(absolute_vipconf_binary, vip_conf, "up", virt_ip, "/usr/sbin/ifconfig", interface, sub_id, NULL);
@@ -1148,7 +1148,7 @@ VMap::downAddr(char *virt_ip)
interface = ((VIPInfo *) hash_value)->interface;
sub_id = ((VIPInfo *) hash_value)->sub_interface_id;
-#if (HOST_OS == linux)|| (HOST_OS == freebsd) || (HOST_OS == solaris) || (HOST_OS == darwin)
+#if defined(linux)|| defined(freebsd) || defined(solaris) || defined(darwin)
res = execl(absolute_vipconf_binary, vip_conf, "down", virt_ip, "/sbin/ifconfig", interface, sub_id, (char*)NULL);
#else
res = execl(absolute_vipconf_binary, vip_conf, "down", virt_ip, "/usr/sbin/ifconfig", interface, sub_id, NULL);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Sat May 22 13:51:11 2010
@@ -25,7 +25,7 @@
#include "I_Layout.h"
#include "I_Version.h"
-#if (HOST_OS == linux)
+#if defined(linux)
#include "sys/utsname.h"
#include "ink_killall.h"
#include <sys/types.h>
@@ -64,7 +64,7 @@ static char cop_lockfile[PATH_MAX];
static char manager_lockfile[PATH_MAX];
static char server_lockfile[PATH_MAX];
-#if (HOST_OS == linux)
+#if defined(linux)
static bool check_memory_required = false;
#endif
static int check_memory_min_swapfree_kb = 10240;
@@ -227,7 +227,7 @@ sig_child(int signum)
}
static void
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sig_fatal(int signum, siginfo_t * t, void *c)
#else
sig_fatal(int signum)
@@ -236,7 +236,7 @@ sig_fatal(int signum)
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Entering sig_fatal(%d)\n", signum);
#endif
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
if (t) {
if (t->si_code <= 0) {
cop_log(COP_FATAL, "cop received fatal user signal [%d] from"
@@ -247,7 +247,7 @@ sig_fatal(int signum)
} else {
#endif
cop_log(COP_FATAL, "cop received fatal signal [%d]\n", signum);
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
}
#endif
#ifdef TRACE_LOG_COP
@@ -257,7 +257,7 @@ sig_fatal(int signum)
}
static void
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sig_alarm_warn(int signum, siginfo_t * t, void *c)
#else
sig_alarm_warn(int signum)
@@ -295,7 +295,7 @@ set_alarm_death()
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Entering set_alarm_death()\n");
#endif
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
action.sa_handler = NULL;
action.sa_sigaction = sig_fatal;
sigemptyset(&action.sa_mask);
@@ -320,7 +320,7 @@ set_alarm_warn()
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Entering set_alarm_warn()\n");
#endif
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
action.sa_handler = NULL;
action.sa_sigaction = sig_alarm_warn;
sigemptyset(&action.sa_mask);
@@ -446,7 +446,7 @@ transient_error(int error, int wait_ms)
#ifdef ENOBUFS
case ENOBUFS:
#endif
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
case ENOSR:
#endif
if (wait_ms)
@@ -723,7 +723,7 @@ spawn_manager()
if (err < 0) {
break;
}
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
err = semctl(err, 1, IPC_RMID);
#else
union semun dummy_semun;
@@ -1417,7 +1417,7 @@ check_programs()
Lockfile manager_lf(manager_lockfile);
err = manager_lf.Open(&holding_pid);
chown_file_to_user(manager_lockfile, admin_user);
-#if (HOST_OS == linux)
+#if defined(linux)
// if lockfile held, but process doesn't exist, killall and try again
if (err == 0) {
if (kill(holding_pid, 0) == -1) {
@@ -1509,7 +1509,7 @@ check_programs()
Lockfile server_lf(server_lockfile);
err = server_lf.Open(&holding_pid);
-#if (HOST_OS == linux)
+#if defined(linux)
// if lockfile held, but process doesn't exist, killall and try again
if (err == 0) {
if (kill(holding_pid, 0) == -1) {
@@ -1549,7 +1549,7 @@ check_memory()
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Entering check_memory()\n");
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
if (check_memory_required) {
FILE *fp;
char buf[LINE_MAX];
@@ -1728,14 +1728,14 @@ init_signals()
// these signals arrive in order to generate a core. There is some
// difficulty with generating core files when linking with libthread
// under solaris.
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
action.sa_handler = NULL;
action.sa_sigaction = sig_fatal;
#else
action.sa_handler = sig_fatal;
#endif
sigemptyset(&action.sa_mask);
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
action.sa_flags = SA_SIGINFO;
#else
action.sa_flags = 0;
@@ -1746,7 +1746,7 @@ init_signals()
sigaction(SIGFPE, &action, NULL);
sigaction(SIGBUS, &action, NULL);
sigaction(SIGSEGV, &action, NULL);
-#if (HOST_OS != linux)
+#if !defined(linux)
sigaction(SIGEMT, &action, NULL);
sigaction(SIGSYS, &action, NULL);
#endif
@@ -1876,7 +1876,7 @@ init()
init_lockfiles();
check_lockfile();
-#if (HOST_OS == linux)
+#if defined(linux)
struct utsname buf;
if (uname(&buf) >= 0) {
if (strncmp(buf.release, "2.2.", 4) == 0) {
@@ -1918,7 +1918,7 @@ main(int argc, char *argv[])
signal(SIGTTIN, SIG_IGN);
setsid(); // Important, thanks Vlad. :)
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
setpgrp(0,0);
#else
setpgrp();
Modified: trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.h Sat May 22 13:51:11 2010
@@ -94,7 +94,7 @@ struct StatFloatSamples
#endif
// Urgly workaround -- no optimization in HPUX
-#if (HOST_OS == hpux)
+#if defined(hpux)
#define inline
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.cc Sat May 22 13:51:11 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#if (HOST_OS == linux) || (HOST_OS == solaris) || (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(linux) || defined(solaris) || defined(freebsd) || defined(darwin)
#include "inktomi++.h"
#include "I_Layout.h"
@@ -66,7 +66,7 @@
int
Config_GetHostname(char *hostname, size_t hostname_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return (Net_GetHostname(hostname, hostname_len));
#else
return -1;
@@ -77,7 +77,7 @@ int
Config_SetHostname(char *hostname)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
char old_hostname[256];
INKInt val;
bool rni = false;
@@ -154,7 +154,7 @@ Config_SetHostname(char *hostname)
int
Config_GetDefaultRouter(char *router, size_t len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_GetDefaultRouter(router, len));
#else
return -1;
@@ -165,7 +165,7 @@ int
Config_SetDefaultRouter(char *router)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
char old_router[80];
//validate
@@ -206,7 +206,7 @@ Config_SetDefaultRouter(char *router)
int
Config_GetDomain(char *domain, size_t domain_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return (Net_GetDomain(domain, domain_len));
#else
return -1;
@@ -217,7 +217,7 @@ int
Config_SetDomain(const char *domain)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
char old_domain[80];
status = Config_GetDomain(old_domain, sizeof(old_domain));
@@ -250,7 +250,7 @@ Config_SetDomain(const char *domain)
int
Config_GetDNS_Servers(char *dns, size_t dns_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return (Net_GetDNS_Servers(dns, dns_len));
#else
return -1;
@@ -261,7 +261,7 @@ int
Config_SetDNS_Servers(char *dns)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
char old_dns[80];
DPRINTF(("Config_SetDNS_Servers: dns %s\n", dns));
@@ -295,7 +295,7 @@ Config_SetDNS_Servers(char *dns)
int
Config_GetDNS_Server(char *server, size_t server_len, int no)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return (Net_GetDNS_Server(server, server_len, no));
#else
return -1;
@@ -305,7 +305,7 @@ Config_GetDNS_Server(char *server, size_
int
Config_GetNetworkIntCount()
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_GetNetworkIntCount());
#else
return -1;
@@ -315,7 +315,7 @@ Config_GetNetworkIntCount()
int
Config_GetNetworkInt(int int_num, char *interface, size_t interface_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_GetNetworkInt(int_num, interface, interface_len));
#else
return -1;
@@ -325,7 +325,7 @@ Config_GetNetworkInt(int int_num, char *
int
Config_GetNIC_Status(char *interface, char *status, size_t status_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_GetNIC_Status(interface, status, status_len));
#else
return -1;
@@ -335,7 +335,7 @@ Config_GetNIC_Status(char *interface, ch
int
Config_GetNIC_Start(char *interface, char *start, size_t start_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return (Net_GetNIC_Start(interface, start, start_len));
#else
return -1;
@@ -345,7 +345,7 @@ Config_GetNIC_Start(char *interface, cha
int
Config_GetNIC_Protocol(char *interface, char *protocol, size_t protocol_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return (Net_GetNIC_Protocol(interface, protocol, protocol_len));
#else
return -1;
@@ -355,7 +355,7 @@ Config_GetNIC_Protocol(char *interface,
int
Config_GetNIC_IP(char *interface, char *ip, size_t ip_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_GetNIC_IP(interface, ip, ip_len));
#else
return -1;
@@ -365,7 +365,7 @@ Config_GetNIC_IP(char *interface, char *
int
Config_GetNIC_Netmask(char *interface, char *netmask, size_t netmask_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_GetNIC_Netmask(interface, netmask, netmask_len));
#else
return -1;
@@ -375,7 +375,7 @@ Config_GetNIC_Netmask(char *interface, c
int
Config_GetNIC_Gateway(char *interface, char *gateway, size_t gateway_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return (Net_GetNIC_Gateway(interface, gateway, gateway_len));
#else
return -1;
@@ -386,7 +386,7 @@ int
Config_SetNIC_Down(char *interface)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
char ip[80];
//validate
@@ -417,7 +417,7 @@ Config_SetNIC_StartOnBoot(char *interfac
if ((interface == NULL) || (onboot == NULL)) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_SetNIC_StartOnBoot(interface, onboot));
#else
return -1;
@@ -431,7 +431,7 @@ Config_SetNIC_BootProtocol(char *interfa
if ((interface == NULL) || (nic_protocol == NULL)) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_SetNIC_BootProtocol(interface, nic_protocol));
#else
return -1;
@@ -446,7 +446,7 @@ Config_SetNIC_IP(char *interface, char *
if ((interface == NULL) || (nic_ip == NULL)) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
status = (Net_SetNIC_IP(interface, nic_ip));
#endif
return status;
@@ -460,7 +460,7 @@ Config_SetNIC_Netmask(char *interface, c
if ((interface == NULL) || (nic_netmask == NULL)) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
status = (Net_SetNIC_Netmask(interface, nic_netmask));
#endif
return status;
@@ -476,7 +476,7 @@ Config_SetNIC_Gateway(char *interface, c
}
DPRINTF(("Config_SetNIC_gateway:: interface %s gateway %s\n", interface, nic_gateway));
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
status = (Net_SetNIC_Gateway(interface, nic_gateway));
#endif
return status;
@@ -486,7 +486,7 @@ int
Config_SetNIC_Up(char *interface, char *onboot, char *protocol, char *ip, char *netmask, char *gateway)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
char old_ip[80];
INKInt val;
bool rni = false;
@@ -540,7 +540,7 @@ Config_GetTime(char *hour, const size_t
const size_t secondSize)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
status = Time_GetTime(hour, hourSize, minute, minuteSize, second, secondSize);
#endif
return status;
@@ -554,7 +554,7 @@ Config_SetTime(bool restart, char *hour,
if (hour == NULL || minute == NULL || second == NULL) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
status = Time_SetTime(restart, hour, minute, second);
#endif
return status;
@@ -564,7 +564,7 @@ int
Config_GetDate(char *month, const size_t monthSize, char *day, const size_t daySize, char *year, const size_t yearSize)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
status = Time_GetDate(month, monthSize, day, daySize, year, yearSize);
#endif
return status;
@@ -578,7 +578,7 @@ Config_SetDate(bool restart, char *month
if (month == NULL || day == NULL || year == NULL) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
status = Time_SetDate(restart, month, day, year);
#endif
return status;
@@ -588,7 +588,7 @@ int
Config_SortTimezone(void)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
status = Time_SortTimezone();
#endif
return status;
@@ -598,7 +598,7 @@ int
Config_GetTimezone(char *timezone, size_t timezone_len)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
status = Time_GetTimezone(timezone, timezone_len);
#endif
return status;
@@ -612,7 +612,7 @@ Config_SetTimezone(bool restart, char *t
if (timezone == NULL) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
status = Time_SetTimezone(restart, timezone);
#endif
return status;
@@ -622,7 +622,7 @@ int
Config_GetNTP_Servers(char *server, size_t server_len)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
status = Time_GetNTP_Servers(server, server_len);
#endif
return status;
@@ -636,7 +636,7 @@ Config_SetNTP_Servers(bool restart, char
if (server == NULL) {
return -1;
}
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
status = Time_SetNTP_Servers(restart, server);
#endif
return status;
@@ -646,7 +646,7 @@ int
Config_GetNTP_Server(char *server, size_t server_len, int no)
{
int status = -1;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
status = Time_GetNTP_Server(server, server_len, no);
#endif
return status;
@@ -689,7 +689,7 @@ Config_SaveVersion(char *file)
}
-#if (HOST_OS == linux)
+#if defined(linux)
int
Config_SNMPSetUp(char *sys_location, char *sys_contact, char *sys_name, char *authtrapenable, char *trap_community,
char *trap_host)
@@ -721,7 +721,7 @@ Config_SNMPGetInfo(char *sys_location, s
int
Config_GetNTP_Status(char *status, size_t status_len)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
return Time_GetNTP_Status(status, status_len);
#else
return -1;
@@ -731,7 +731,7 @@ Config_GetNTP_Status(char *status, size_
int
Config_SetNTP_Off(void)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return Time_SetNTP_Off();
#else
return -1;
@@ -741,7 +741,7 @@ Config_SetNTP_Off(void)
int
Config_User_Root(int *old_euid)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return Sys_User_Root(old_euid);
#else
return -1;
@@ -751,7 +751,7 @@ Config_User_Root(int *old_euid)
int
Config_User_Inktomi(int euid)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return Sys_User_Inktomi(euid);
#else
return -1;
@@ -761,7 +761,7 @@ Config_User_Inktomi(int euid)
int
Config_Grp_Root(int *old_egid)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return Sys_Grp_Root(old_egid);
#else
return -1;
@@ -771,14 +771,14 @@ Config_Grp_Root(int *old_egid)
int
Config_Grp_Inktomi(int egid)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return Sys_Grp_Inktomi(egid);
#else
return -1;
#endif
}
-#if (HOST_OS == linux)
+#if defined(linux)
int
Config_DisableInterface(char *eth)
{
@@ -866,7 +866,7 @@ Config_RestoreNetConfig(char *file)
snprintf(eth, sizeof(eth), "eth%d", ++count);
}
-#if (HOST_OS == linux)
+#if defined(linux)
// Clear all disabled interfaces
snprintf(eth, sizeof(eth), "eth0");
count = 0;
@@ -911,7 +911,7 @@ Config_RestoreNetConfig(char *file)
xfree(TagValue);
}
-#if (HOST_OS == linux)
+#if defined(linux)
char *sys_location = netXml.getXmlTagValue("SNMPSysLocation");
char *sys_contact = netXml.getXmlTagValue("SNMPSysContact");
char *sys_name = netXml.getXmlTagValue("SNMPSysName");
@@ -971,11 +971,11 @@ Config_RestoreNetConfig(char *file)
if (TagValue != NULL) {
//This is the last one - here we restart TM if it is not floppy configuration
if (!isFloppyConfig) {
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
Time_SetTimezone(true, TagValue);
#endif
} else {
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
Time_SetTimezone(false, TagValue);
#endif
}
@@ -997,7 +997,7 @@ Config_SaveNetConfig(char *file)
//char ethXNM[24];
//char ethXGW[24];
XMLDom netConfigXML;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
netConfigXML.setNodeName("APPLIANCE_CONFIG");
XMLNode *child2 = new XMLNode;
@@ -1178,7 +1178,7 @@ Config_SaveNetConfig(char *file)
child->AppendChild(NTPServers);
}
-#if (HOST_OS == linux)
+#if defined(linux)
char sys_location[256];
char sys_contact[256];
char sys_name[256];
@@ -1338,7 +1338,7 @@ XmlObject::getXmlTagValueAndAttribute(ch
int
Config_SetSMTP_Server(char *server)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_SetSMTP_Server(server));
#else
return -1;
@@ -1348,7 +1348,7 @@ Config_SetSMTP_Server(char *server)
int
Config_GetSMTP_Server(char *server)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
return (Net_GetSMTP_Server(server));
#else
return -1;
@@ -1503,4 +1503,4 @@ Config_FloppyNetRestore()
}
-#endif /* (HOST_OS == linux) || (HOST_OS == solaris) || (HOST_OS == freebsd) || (HOST_OS == darwin) */
+#endif /* defined(linux) || defined(solaris) || defined(freebsd) || defined(darwin) */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/ConfigAPI.h Sat May 22 13:51:11 2010
@@ -26,7 +26,7 @@
#include "../utils/XmlUtils.h"
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include "ink_bool.h"
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc Sat May 22 13:51:11 2010
@@ -32,7 +32,7 @@
#include "ink_config.h"
-#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(darwin) || defined(freebsd)
/* This program has not been ported to these operating systems at all,
* and even the linux one is insanely distro specific.
*/
@@ -42,7 +42,7 @@ int main()
};
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <ctype.h>
#include <stdlib.h>
@@ -1512,7 +1512,7 @@ main(int argc, char **argv)
#endif
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include <ctype.h>
#include <stdlib.h>
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc Sat May 22 13:51:11 2010
@@ -41,7 +41,7 @@
#include <sys/ipc.h>
#include <sys/sem.h>
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>
@@ -80,7 +80,7 @@ main(int argc, char **argv)
} else if (argc == 2) {
start = atoi(argv[1]);
for (;;) {
-#if (HOST_OS == linux)
+#if defined(linux)
union semun semun_dummy;
if ((tmp = semget(start, 1, 0666)) < 0 || semctl(tmp, 1, IPC_RMID, semun_dummy) < 0) {
#else
@@ -94,7 +94,7 @@ main(int argc, char **argv)
start = atoi(argv[1]);
end = atoi(argv[2]);
for (int i = start; i < end; i++) {
-#if (HOST_OS == linux)
+#if defined(linux)
union semun semun_dummy;
if ((tmp = semget(i, 1, 0666)) < 0 || semctl(tmp, 1, IPC_RMID, semun_dummy) < 0) {
#else
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc Sat May 22 13:51:11 2010
@@ -31,7 +31,7 @@
#include <pcre.h>
#endif
-#if (HOST_OS == linux) || (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(linux) || defined(freebsd) || defined(darwin)
#include "SysAPI.h"
#include <unistd.h>
@@ -608,7 +608,7 @@ int
Net_SetNIC_BootProtocol(char *interface, char *nic_protocol)
{
char nic_boot[80], nic_ip[80], nic_netmask[80], nic_gateway[80];
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
Net_GetNIC_Start(interface, nic_boot, sizeof(nic_boot));
Net_GetNIC_IP(interface, nic_ip, sizeof(nic_ip));
Net_GetNIC_Netmask(interface, nic_netmask, sizeof(nic_netmask));
@@ -621,7 +621,7 @@ int
Net_SetNIC_IP(char *interface, char *nic_ip)
{
//int status;
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
char nic_boot[80], nic_protocol[80], nic_netmask[80], nic_gateway[80], old_ip[80];
Net_GetNIC_IP(interface, old_ip, sizeof(old_ip));
Net_GetNIC_Start(interface, nic_boot, sizeof(nic_boot));
@@ -638,7 +638,7 @@ Net_SetNIC_IP(char *interface, char *nic
int
Net_SetNIC_Netmask(char *interface, char *nic_netmask)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
char nic_boot[80], nic_protocol[80], nic_ip[80], nic_gateway[80];
Net_GetNIC_Start(interface, nic_boot, sizeof(nic_boot));
Net_GetNIC_Protocol(interface, nic_protocol, sizeof(nic_protocol));
@@ -654,7 +654,7 @@ Net_SetNIC_Netmask(char *interface, char
int
Net_SetNIC_Gateway(char *interface, char *nic_gateway)
{
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
char nic_boot[80], nic_protocol[80], nic_ip[80], nic_netmask[80];
Net_GetNIC_Start(interface, nic_boot, sizeof(nic_boot));
Net_GetNIC_Protocol(interface, nic_protocol, sizeof(nic_protocol));
@@ -717,7 +717,7 @@ Net_SetNIC_Up(char *interface, char *onb
}
-#if (HOST_OS == linux)
+#if defined(linux)
// Disable all previously disabled, and now active interfaces
int
@@ -1771,9 +1771,9 @@ Net_SNMPGetInfo(char *sys_location, size
return 0;
}
-#endif /* (HOST_OS == linux) || (HOST_OS == freebsd) || (HOST_OS == darwin) */
+#endif /* defined(linux) || defined(freebsd) || defined(darwin) */
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include "SysAPI.h"
#include <stdio.h>
@@ -2528,7 +2528,7 @@ int
Net_SetNIC_BootProtocol(char *interface, char *nic_protocol)
{
char nic_boot[80], nic_ip[80], nic_netmask[80], nic_gateway[80];
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
Net_GetNIC_Start(interface, nic_boot, sizeof(nic_boot));
Net_GetNIC_IP(interface, nic_ip, sizeof(nic_ip));
Net_GetNIC_Netmask(interface, nic_netmask, sizeof(nic_netmask));
@@ -2545,9 +2545,9 @@ Net_SetNIC_IP(char *interface, char *nic
{
//int status;
// XXX: Why this test?
- // We are inside #define HOST_OS == solaris
+ // We are inside #define(solaris)
//
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
char nic_boot[80], nic_protocol[80], nic_netmask[80], nic_gateway[80], old_ip[80];
Net_GetNIC_IP(interface, old_ip, sizeof(old_ip));
Net_GetNIC_Start(interface, nic_boot);
@@ -2565,9 +2565,9 @@ int
Net_SetNIC_Netmask(char *interface, char *nic_netmask)
{
// XXX: Why this test?
- // We are inside #define HOST_OS == solaris
+ // We are inside #define (solaris)
//
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
char nic_boot[80], nic_protocol[80], nic_ip[80], nic_gateway[80];
Net_GetNIC_Start(interface, nic_boot);
Net_GetNIC_Protocol(interface, nic_protocol);
@@ -2584,9 +2584,9 @@ int
Net_SetNIC_Gateway(char *interface, char *nic_gateway)
{
// XXX: Why this test?
- // We are inside #define HOST_OS == solaris
+ // We are inside #define (solaris)
//
-#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
+#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
char nic_boot[80], nic_protocol[80], nic_ip[80], nic_netmask[80];
Net_GetNIC_Start(interface, nic_boot);
Net_GetNIC_Protocol(interface, nic_protocol);
@@ -3233,4 +3233,4 @@ Sys_Grp_Inktomi(int egid)
return 0;
}
-#endif /* (HOST_OS == solaris) */
+#endif /* defined(solaris) */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.h Sat May 22 13:51:11 2010
@@ -24,7 +24,7 @@
#ifndef _SYS_API_H
#define _SYS_API_H
-#if (HOST_OS == solaris)
+#if defined(solaris)
#include "ink_bool.h"
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc Sat May 22 13:51:11 2010
@@ -48,7 +48,7 @@
int
main(int argc, char *argv[])
{
-#if (HOST_OS == linux)
+#if defined(linux)
struct tm *mPtr;
struct timeval v;
FILE *fp, *tmp;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc Sat May 22 13:51:11 2010
@@ -40,13 +40,13 @@
struct ifafilt;
#include <net/if.h>
-#if (HOST_OS == linux)
+#if defined(linux)
#include <sys/ioctl.h>
#else
#include <sys/sockio.h>
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
@@ -60,7 +60,7 @@ struct ifafilt;
void up_interface(char *binary, char *vip, char *interface);
void down_interface(char *binary, char *vip, char *interface);
-#if (HOST_OS == linux)
+#if defined(linux)
char *get_netmask_for_intr(char *intrName);
char *get_broadcast_for_intr(char *intrName);
#endif
@@ -131,7 +131,7 @@ up_interface(char *binary, char *vip, ch
int status;
pid_t pid;
-#if (HOST_OS == linux)
+#if defined(linux)
char *netmask = NULL;
char *broadcast = NULL;
@@ -248,7 +248,7 @@ down_interface(char *binary, char *vip,
int status;
pid_t pid;
-#if (HOST_OS == linux)
+#if defined(linux)
if ((pid = fork()) < 0) {
exit(1);
@@ -322,7 +322,7 @@ down_interface(char *binary, char *vip,
return;
} /* End down_interface */
-#if (HOST_OS == linux)
+#if defined(linux)
// char* get_netmask_for_intr(char* intrName)
//
// Looks up the netmask for the interface specifiec by intrName
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSocket.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSocket.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSocket.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSocket.h Sat May 22 13:51:11 2010
@@ -145,7 +145,7 @@ mgmt_select(int nfds, fd_set * readfds,
// mgmt_select call will still timeout correctly, rather than
// possibly extending our timeout period by up to
// MGMT_MAX_TRANSIENT_ERRORS times.
-#if (HOST_OS == linux)
+#if defined(linux)
int r, retries;
for (retries = 0; retries < MGMT_MAX_TRANSIENT_ERRORS; retries++) {
r =::select(nfds, readfds, writefds, errorfds, timeout);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc Sat May 22 13:51:11 2010
@@ -165,7 +165,7 @@ mgmt_read_pipe(int fd, char *buf, int by
switch (errno) {
case EINTR:
case EAGAIN:
-#if (HOST_OS == hpux)
+#if defined(hpux)
case EWOULDBLOCK:
#endif
mgmt_sleep_msec(1);
@@ -207,7 +207,7 @@ mgmt_write_pipe(int fd, char *buf, int b
switch (errno) {
case EINTR:
case EAGAIN:
-#if (HOST_OS == hpux)
+#if defined(hpux)
case EWOULDBLOCK:
#endif
mgmt_sleep_msec(1);
@@ -304,7 +304,7 @@ mgmt_write_pipe(HANDLE hpipe, char *data
void
mgmt_blockAllSigs()
{
-#if (HOST_OS != linux) && !defined(_WIN32)
+#if !defined(linux) && !defined(_WIN32)
// Start by blocking all signals
sigset_t allSigs; // Set of all signals
sigfillset(&allSigs);
@@ -580,7 +580,7 @@ get_interface_mtu(int sock_fd, struct if
mgmt_log(stderr, "[getAddrForIntr] Unable to obtain MTU for " "interface '%s'", ifr->ifr_name);
return 0;
} else
-#if (HOST_OS == solaris) || (HOST_OS == hpux)
+#if defined(solaris) || defined(hpux)
return ifr->ifr_metric;
#else
return ifr->ifr_mtu;
@@ -662,7 +662,7 @@ mgmt_getAddrForIntr(char *intrName, stru
}
}
}
-#if (HOST_OS == freebsd) || (HOST_OS == darwin)
+#if defined(freebsd) || defined(darwin)
ifr = (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len);
#else
ifr = (struct ifreq *) (((char *) ifr) + sizeof(*ifr));
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc Sat May 22 13:51:11 2010
@@ -51,7 +51,7 @@
SimpleQueue::SimpleQueue()
{
ink_mutex_init(&accessLock, "SimpleQueue Lock");
-#if (HOST_OS == darwin)
+#if defined(darwin)
static int qnum = 0;
char sname[NAME_MAX];
qnum++;
@@ -86,7 +86,7 @@ SimpleQueue::~SimpleQueue()
}
ink_mutex_destroy(&accessLock);
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_close(waitSema);
#else
ink_sem_destroy(&waitSema);
@@ -106,7 +106,7 @@ SimpleQueue::dequeue()
void *data;
// Wait for something to be on the queue
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_wait(waitSema);
#else
ink_sem_wait(&waitSema);
@@ -147,7 +147,7 @@ SimpleQueue::pop()
void *data;
// Wait for something to be on the queue
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_wait(waitSema);
#else
ink_sem_wait(&waitSema);
@@ -203,7 +203,7 @@ SimpleQueue::enqueue(void *data)
}
ink_mutex_release(&accessLock);
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(waitSema);
#else
ink_sem_post(&waitSema);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h Sat May 22 13:51:11 2010
@@ -58,7 +58,7 @@ public:
void Print();
private:
ink_mutex accessLock;
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem *waitSema;
#else
ink_sem waitSema;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc Sat May 22 13:51:11 2010
@@ -1013,9 +1013,9 @@ computeXactMax()
RecInt maxXact = 0;
int err = REC_ERR_FAIL;
-#if (HOST_OS == hpux)
+#if defined(hpux)
numCPU = pthread_num_processors_np();
-#elif (HOST_OS == freebsd)
+#elif defined(freebsd)
numCPU = 1;
#else
numCPU = sysconf(_SC_NPROCESSORS_ONLN);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h Sat May 22 13:51:11 2010
@@ -56,12 +56,12 @@ typedef int WebHandle;
// WebGetHostname
//-------------------------------------------------------------------------
-#if (HOST_OS == freebsd)
+#if defined(freebsd)
//extern "C" struct hostent *gethostbyaddr_r(const char *addr, int length, int type,
// struct hostent *result, char *buffer, int buflen, int *h_errnop);
#endif
-#if (HOST_OS == solaris)
+#if defined(solaris)
extern "C"
{
struct hostent *gethostbyaddr_r(const char *addr,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h Sat May 22 13:51:11 2010
@@ -108,7 +108,7 @@ struct WebInterFaceGlobals
{
ink_mutex serviceThrLock;
ink_mutex submitLock;
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem *serviceThrCount;
#else
ink_sem serviceThrCount;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Sat May 22 13:51:11 2010
@@ -3354,7 +3354,7 @@ handle_submit_net_config(WebHttpContext
// if (recs_out_of_date)
// goto Lout_of_date;
-#if (HOST_OS == linux) || (HOST_OS == solaris)
+#if defined(linux) || defined(solaris)
InkHashTableIteratorState htis;
InkHashTableEntry *hte;
@@ -4100,7 +4100,7 @@ signal_handler_init()
#if !defined(_WIN32)
sigset_t sigsToBlock;
// FreeBSD and Linux use SIGUSR1 internally in the threads library
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(linux) && !defined(freebsd) && !defined(darwin)
// Set up the handler for SIGUSR1
struct sigaction sigHandler;
sigHandler.sa_handler = signal_handler_do_nothing;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Sat May 22 13:51:11 2010
@@ -1494,12 +1494,12 @@ handle_select_system_logs(WebHttpContext
MgmtInt fsize;;
// define the name of syslog in different OS
-#if (HOST_OS == linux)
+#if defined(linux)
syslog = "messages";
#endif
// define the path of syslog in different OS
-#if (HOST_OS == linux)
+#if defined(linux)
syslog_path = "/var/log/";
#endif
@@ -2522,7 +2522,7 @@ static int
handle_network(WebHttpContext * whc, char *tag, char *arg)
{
int err = WEB_HTTP_ERR_OKAY;
-#if (HOST_OS == linux) || (HOST_OS == solaris)
+#if defined(linux) || defined(solaris)
char value[1024];
char *value_safe, *old_value, *dummy;
char *pos;
@@ -2672,7 +2672,7 @@ Ldone:
static int
handle_network_object(WebHttpContext * whc, char *tag, char *arg)
{
-#if (HOST_OS == linux)
+#if defined(linux)
char *device_ink_path, *template_ink_path;
char command[200], tmpname[80], interface[80];
@@ -2794,7 +2794,7 @@ WebHttpRender(WebHttpContext * whc, cons
int file_size;
char *doc_root_file;
ink_debug_assert(file != NULL);
-#if (HOST_OS == linux) || (HOST_OS == solaris)
+#if defined(linux) || defined(solaris)
//Bug 49922, for those .ink files which may meet the root-only system files,
//upgrade the uid to root.
int old_euid;
@@ -2827,7 +2827,7 @@ Lnot_found:
Ldone:
-#if (HOST_OS == linux) || (HOST_OS == solaris)
+#if defined(linux) || defined(solaris)
if (change_uid) {
Config_User_Inktomi(old_euid);
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc Sat May 22 13:51:11 2010
@@ -50,7 +50,7 @@
#include "EventControlMain.h"
#include "MgmtPlugin.h"
-#if (HOST_OS != linux)
+#if !defined(linux)
// Solaris header files forget this one
extern "C"
{
@@ -393,7 +393,7 @@ newUNIXsocket(char *fpath)
serv_addr.sun_family = AF_UNIX;
ink_strncpy(serv_addr.sun_path, fpath, sizeof(serv_addr.sun_path));
-#if (HOST_OS == darwin) || (HOST_OS == freebsd)
+#if defined(darwin) || defined(freebsd)
servlen = sizeof(struct sockaddr_un);
#else
servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
@@ -551,10 +551,10 @@ serviceThrReaper(void *arg)
// socket will give up
shutdown(wGlobals.serviceThrArray[i].fd, 0);
-#if (HOST_OS != freebsd) && (HOST_OS != darwin)
+#if !defined(freebsd) && !defined(darwin)
ink_thread_cancel(wGlobals.serviceThrArray[i].threadId);
#endif
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(wGlobals.serviceThrCount);
#else
ink_sem_post(&wGlobals.serviceThrCount);
@@ -571,7 +571,7 @@ serviceThrReaper(void *arg)
ink_mutex_release(&wGlobals.serviceThrLock);
for (int j = 0; j < numJoined; j++) {
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(wGlobals.serviceThrCount);
#else
ink_sem_post(&wGlobals.serviceThrCount);
@@ -612,7 +612,7 @@ webIntr_main(void *x)
int overseerPort = -1;
int rafEnabled = -1;
int rafPort = -1;
-#if (HOST_OS != linux)
+#if !defined(linux)
sigset_t allSigs; // Set of all signals
#endif
char *cliPath = NULL; // UNIX: socket path for cli
@@ -637,7 +637,7 @@ webIntr_main(void *x)
// No Warning
x = x;
-#if (HOST_OS != linux)
+#if !defined(linux)
// Start by blocking all signals
sigfillset(&allSigs);
ink_thread_sigsetmask(SIG_SETMASK, &allSigs, NULL);
@@ -654,7 +654,7 @@ webIntr_main(void *x)
//initFrameBindings();
// Set up the threads management
-#if (HOST_OS == darwin)
+#if defined(darwin)
static int qnum = 0;
char sname[NAME_MAX];
qnum++;
@@ -1008,7 +1008,7 @@ webIntr_main(void *x)
} else {
ink_assert(!"[webIntrMain] Error on mgmt_select()\n");
}
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_wait(wGlobals.serviceThrCount);
#else
ink_sem_wait(&wGlobals.serviceThrCount);
@@ -1028,7 +1028,7 @@ webIntr_main(void *x)
// coverity[noescape]
if ((clientFD = mgmt_accept(acceptFD, (sockaddr *) clientInfo, &addrLen)) < 0) {
mgmt_log(stderr, "[WebIntrMain]: %s%s\n", "Accept on incoming connection failed: ", strerror(errno));
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(wGlobals.serviceThrCount);
#else
ink_sem_post(&wGlobals.serviceThrCount);
@@ -1078,7 +1078,7 @@ webIntr_main(void *x)
#endif
) {
mgmt_log("WARNING: connect by disallowed client %s, closing\n", inet_ntoa(clientInfo->sin_addr));
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(wGlobals.serviceThrCount);
#else
ink_sem_post(&wGlobals.serviceThrCount);
@@ -1108,7 +1108,7 @@ webIntr_main(void *x)
wGlobals.serviceThrArray[i].threadId = 0;
wGlobals.serviceThrArray[i].fd = -1;
close_socket(clientFD);
-#if (HOST_OS == darwin)
+#if defined(darwin)
ink_sem_post(wGlobals.serviceThrCount);
#else
ink_sem_post(&wGlobals.serviceThrCount);
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Sat May 22 13:51:11 2010
@@ -55,7 +55,7 @@ struct obj_list *ObjList;
#include <google/profiler.h>
#endif
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if !defined(linux) && !defined(freebsd)
typedef void (*SigActionFunc_t) (int sig, siginfo_t * t, void *f);
#else
typedef void (*SigActionFunc_t) (int sig);
@@ -234,7 +234,7 @@ interrupt_handler(int sig)
_exit(1);
}
-#if (HOST_OS == linux)
+#if defined(linux)
static void
signal_handler(int sig)
#else
@@ -286,7 +286,7 @@ signal_handler(int sig, siginfo_t * t, v
#endif
char sig_msg[2048];
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if !defined(linux) && !defined(freebsd)
// Print out information about where the signal came from
// so that we can debug signal related problems
//
@@ -301,7 +301,7 @@ signal_handler(int sig, siginfo_t * t, v
//
if (t) {
if (t->si_code <= 0) {
-#if (HOST_OS == solaris)
+#if defined(solaris)
snprintf(sig_msg, sizeof(sig_msg), "NOTE: Traffic Server received User Sig %d from pid: %d uid: %d\n",
sig, (int)t->si_pid, (int)t->si_uid);
#else
@@ -332,7 +332,7 @@ signal_handler(int sig, siginfo_t * t, v
case SIGQUIT:
case SIGILL:
case SIGTRAP:
-#if (HOST_OS != linux)
+#if !defined(linux)
case SIGEMT:
case SIGSYS:
#endif
@@ -374,7 +374,7 @@ set_signal(int signal, SigActionFunc_t a
struct sigaction action;
struct sigaction o_action;
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if !defined(linux) && !defined(freebsd)
action.sa_handler = NULL;
action.sa_sigaction = action_func;
#else
@@ -394,7 +394,7 @@ check_signal(int signal, SigActionFunc_t
struct sigaction action;
struct sigaction o_action;
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if !defined(linux) && !defined(freebsd)
action.sa_handler = NULL;
action.sa_sigaction = action_func;
action.sa_flags = SA_SIGINFO;
@@ -408,7 +408,7 @@ check_signal(int signal, SigActionFunc_t
int res = sigaction(signal, &action, &o_action);
ink_release_assert(res == 0);
-#if (HOST_OS != linux) && (HOST_OS != freebsd)
+#if !defined(linux) && !defined(freebsd)
if (o_action.sa_sigaction != action_func) {
fprintf(stderr, "Handler for signal %d was %p, not %p as expected\n", signal, o_action.sa_sigaction, action_func);
}
@@ -449,7 +449,7 @@ check_signals()
// This thread checks the signals every 2 seconds to make
// certain the DEC pthreads SIGPIPE bug isn't back..
//
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && defined(DEBUG)
+#if !defined(linux) && !defined(freebsd) && defined(DEBUG)
static void *
check_signal_thread(void *)
{
@@ -500,7 +500,7 @@ init_signals(bool do_stackdump)
}
#endif
-#if (HOST_OS != freebsd)
+#if !defined(freebsd)
set_signal(SIGUSR1, (SigActionFunc_t) signal_handler);
#endif
@@ -508,11 +508,11 @@ init_signals(bool do_stackdump)
set_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
#endif
-#if (HOST_OS == linux)
+#if defined(linux)
set_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
#endif
-#if (HOST_OS != linux) && (HOST_OS != freebsd) && defined(DEBUG)
+#if !defined(linux) && !defined(freebsd) && defined(DEBUG)
ink_thread_create(check_signal_thread, NULL);
#endif
Modified: trafficserver/traffic/trunk/test/SDKtest/client/Plugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/Plugin.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/Plugin.cc (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/Plugin.cc Sat May 22 13:51:11 2010
@@ -27,7 +27,7 @@
******************************************************************/
#include "Plugin.h"
-#if (HOST_OS == hpux)
+#if defined(hpux)
#include <dl.h>
void *
Modified: trafficserver/traffic/trunk/test/SDKtest/synth_server/synth_server.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/synth_server/synth_server.c?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/synth_server/synth_server.c (original)
+++ trafficserver/traffic/trunk/test/SDKtest/synth_server/synth_server.c Sat May 22 13:51:11 2010
@@ -56,7 +56,7 @@
#include <assert.h>
#include "api/ServerAPI.h"
-#if (HOST_OS != hpux)
+#if !defined(hpux)
#include <dlfcn.h>
#endif
@@ -164,7 +164,7 @@ char *Xstring;
}
*/
-#if (HOST_OS == hpux)
+#if defined(hpux)
#include <dl.h>
#define RTLD_NOW BIND_IMMEDIATE
Modified: trafficserver/traffic/trunk/test/deft/remote_start.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/remote_start.cc?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/remote_start.cc (original)
+++ trafficserver/traffic/trunk/test/deft/remote_start.cc Sat May 22 13:51:11 2010
@@ -32,7 +32,7 @@
#include <unistd.h>
-#if (HOST_OS == darwin)
+#if defined(darwin)
// Fix wierd conflict with Tcl #define for panic
#include <sys/mman.h>
#endif
Modified: trafficserver/traffic/trunk/test/deft/sio_loop.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/sio_loop.h?rev=947296&r1=947295&r2=947296&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/sio_loop.h (original)
+++ trafficserver/traffic/trunk/test/deft/sio_loop.h Sat May 22 13:51:11 2010
@@ -36,7 +36,7 @@
#include "List.h"
#include "ink_hrtime.h"
-#if (HOST_OS == darwin)
+#if defined(darwin)
#include "ink_poll.h"
#else
#include <poll.h>