git commit: TS-1124 Try to fix regex_remap to build on Solaris, try 2

[zw...@apache.org]

Updated Branches:
  refs/heads/master 0306f0acb -> ab54b4e2b


TS-1124 Try to fix regex_remap to build on Solaris, try 2


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ab54b4e2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ab54b4e2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ab54b4e2

Branch: refs/heads/master
Commit: ab54b4e2ba1b96d6572bc803ee0f1c672d303f6a
Parents: 0306f0a
Author: Leif Hedstrom <le...@ogre.com>
Authored: Thu Mar 8 10:21:59 2012 -0700
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Thu Mar 8 10:21:59 2012 -0700

----------------------------------------------------------------------
 plugins/regex_remap/regex_remap.cc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab54b4e2/plugins/regex_remap/regex_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index 0429960..e631736 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -50,6 +50,9 @@ typedef volatile int32_t vint32;
 typedef vint32 *pvint32;
 
 #if defined(__SUNPRO_CC)
+typedef volatile uint32_t vuint32;
+typedef vuint32 *pvuint32;
+
 static inline int atomic_increment(pvint32 mem, int value)
 {
   return ((uint32_t)atomic_add_32_nv((pvuint32)mem, (uint32_t)value)) - value;
@@ -62,9 +65,9 @@ static inline int atomic_increment(pvint32 mem, int value)
 #endif
 
 
-// Constants
-const int OVECCOUNT = 30; // We support $0 - $9 x2 ints, and this needs to be 1.5x that
-const int MAX_SUBS = 32; // No more than 32 substitution variables in the subst string
+// Constants, changed to define's to make SunStudio happy ....
+#define OVECCOUNT 30 // We support $0 - $9 x2 ints, and this needs to be 1.5x that
+#define MAX_SUBS 32   // No more than 32 substitution variables in the subst string
 
 // TODO: This should be "autoconf'ed" or something ...
 #define DEFAULT_PATH "/usr/local/etc/regex_remap/"