trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r884771 - in /incubator/trafficserver/traffic/trunk: configure.ac proxy/ControlMatcher.h
Date Fri, 27 Nov 2009 08:12:20 GMT
Author: pquerna
Date: Fri Nov 27 08:12:16 2009
New Revision: 884771

URL: http://svn.apache.org/viewvc?rev=884771&view=rev
Log:
TS-2: use portable detection of regex header

Modified:
    incubator/trafficserver/traffic/trunk/configure.ac
    incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.h

Modified: incubator/trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/configure.ac?rev=884771&r1=884770&r2=884771&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/configure.ac (original)
+++ incubator/trafficserver/traffic/trunk/configure.ac Fri Nov 27 08:12:16 2009
@@ -445,7 +445,7 @@
 # -----------------------------------------------------------------------------
 # 5. CHECK FOR HEADER FILES
 
-AC_CHECK_HEADERS([sys/epoll.h sys/event.h machine/endian.h endian.h sys/sysinfo.h sys/sysctl.h
sys/systeminfo.h netinet/ip.h sys/ioctl.h sys/byteorder.h sys/sockio.h sys/sysctl.h sys/sysinfo.h
sys/systeminfo.h arpa/nameser_compat.h db_185.h db.h execinfo.h netdb.h], [], [])
+AC_CHECK_HEADERS([sys/epoll.h sys/event.h machine/endian.h endian.h sys/sysinfo.h sys/sysctl.h
sys/systeminfo.h netinet/ip.h sys/ioctl.h sys/byteorder.h sys/sockio.h sys/sysctl.h sys/sysinfo.h
sys/systeminfo.h arpa/nameser_compat.h db_185.h db.h execinfo.h netdb.h regex.h ctype.h],
[], [])
 
 sinclude(build-aux/apr_common.m4)
 sinclude(build-aux/apr_network.m4)

Modified: incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.h?rev=884771&r1=884770&r2=884771&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.h Fri Nov 27 08:12:16 2009
@@ -87,20 +87,17 @@
 #ifndef _CONTROL_MATCHER_H_
 #define _CONTROL_MATCHER_H_
 
-#if defined(__alpha)
+
+#ifdef HAVE_REGEX_H
 #include "regex.h"
-#else
+#endif
+
+#ifdef HAVE_CTYPE_H
 #include "ctype.h"
 #endif
+
 #include "DynArray.h"
 #include "IpLookup.h"
-#if (HOST_OS != linux) && !defined(__alpha)
-#include "ink_regex-3.6.h"
-#else
-#if (HOST_OS == linux)
-#include <regex.h>
-#endif
-#endif
 
 #include "ink_port.h"
 #include "HTTP.h"
@@ -178,7 +175,7 @@
 #ifndef TS_MICRO
 protected:
 #endif
-  regex_t * re_array;           // array of compiled regexs
+  struct regex_t * re_array;           // array of compiled regexs
   char **re_str;                // array of uncompiled regex strings
   Data *data_array;             // data array.  Corresponds to re_array
   int array_len;                // length of the arrays (all three are the same length)



Mime
View raw message