From 652bdfec5aceba02ace19ffae8b9375fcd048f34 Mon Sep 17 00:00:00 2001
From: Cass Everitt <cass@xyzw.us>
Date: Mon, 6 Jan 2014 22:13:28 -0600
Subject: [PATCH] win32 checkpoint

---
 scripts/regal/dispatch/RegalDispatchError.py |  3 ++-
 src/regal/RegalDispatchError.cpp             |  3 ++-
 src/regal/RegalDispatchHttp.h                | 26 ++++++++++----------
 src/regal/RegalHttp.cpp                      |  2 +-
 src/regal/RegalInit.cpp                      |  5 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/scripts/regal/dispatch/RegalDispatchError.py b/scripts/regal/dispatch/RegalDispatchError.py
index 49a41e4..745579f 100755
--- a/scripts/regal/dispatch/RegalDispatchError.py
+++ b/scripts/regal/dispatch/RegalDispatchError.py
@@ -106,8 +106,9 @@ localInclude = '''
 
 localCode = '''
 
+void InitDispatchError( Dispatch::GL & tbl );
+
 void Err::Init( RegalContext * ctx ) {
-  void InitDispatchError( Dispatch::GL & tbl );
   next = ctx->dispatchGL;
   InitDispatchError( ctx->dispatchGL );
 }
diff --git a/src/regal/RegalDispatchError.cpp b/src/regal/RegalDispatchError.cpp
index 067fa89..a719e32 100644
--- a/src/regal/RegalDispatchError.cpp
+++ b/src/regal/RegalDispatchError.cpp
@@ -64,8 +64,9 @@ REGAL_NAMESPACE_BEGIN
 using namespace ::REGAL_NAMESPACE_INTERNAL::Logging;
 using namespace ::REGAL_NAMESPACE_INTERNAL::Token;
 
+void InitDispatchError( Dispatch::GL & tbl );
+
 void Err::Init( RegalContext * ctx ) {
-  void InitDispatchError( Dispatch::GL & tbl );
   next = ctx->dispatchGL;
   InitDispatchError( ctx->dispatchGL );
 }
diff --git a/src/regal/RegalDispatchHttp.h b/src/regal/RegalDispatchHttp.h
index 5a2a641..dae9d42 100644
--- a/src/regal/RegalDispatchHttp.h
+++ b/src/regal/RegalDispatchHttp.h
@@ -37,7 +37,7 @@ REGAL_GLOBAL_BEGIN
 #include <deque>
 #include <string>
 
-#include "pcre.h"
+//#include "pcre.h"
 
 #include "RegalDispatch.h"
 #include "RegalMutex.h"
@@ -62,32 +62,32 @@ struct HttpFboInfo {
 
 struct Breakpoint {
   
-  Breakpoint() : enabled(true), count(0), stopAfterCount(0), re(NULL) {}
+	Breakpoint() : enabled(true), count(0), stopAfterCount(0) {} //, re(NULL) {}
   
   ~Breakpoint() {
-    if( re ) {
-      pcre_free( re );
-    }
+    //if( re ) {
+      //pcre_free( re );
+    //}
   }
   
   void SetRegularExpression( const std::string & newRe ) {
 	UNUSED_PARAMETER(newRe);
-    if( re ) {
-      pcre_free( re );
-    }
+    //if( re ) {
+      //pcre_free( re );
+    //}
     const char *errStr = NULL;
     int offset;
-    re = pcre_compile( reString.c_str(), 0, &errStr, &offset, NULL );
-    if( re == NULL ) {
-      Error( "Could not compile breakpoint regular expression '", reString, "' - ", offset, " - ", errStr );
-    }
+    //re = pcre_compile( reString.c_str(), 0, &errStr, &offset, NULL );
+    //if( re == NULL ) {
+     // Error( "Could not compile breakpoint regular expression '", reString, "' - ", offset, " - ", errStr );
+    //}
   }
   
   bool enabled;
   int count;
   int stopAfterCount;
   std::string reString;
-  pcre *re;
+  //pcre *re;
 };
 
 enum HttpRunState {
diff --git a/src/regal/RegalHttp.cpp b/src/regal/RegalHttp.cpp
index 8c5f543..61e9c92 100644
--- a/src/regal/RegalHttp.cpp
+++ b/src/regal/RegalHttp.cpp
@@ -63,7 +63,7 @@ REGAL_NAMESPACE_END
 
 REGAL_GLOBAL_BEGIN
 
-#include "pcre.h"
+//#include "pcre.h"
 
 #include "RegalHttp.h"
 #include "RegalDispatchHttp.h"
diff --git a/src/regal/RegalInit.cpp b/src/regal/RegalInit.cpp
index fb4c991..3ed91bc 100644
--- a/src/regal/RegalInit.cpp
+++ b/src/regal/RegalInit.cpp
@@ -89,12 +89,13 @@ TH2RC th2rc;
 Thread::Mutex *sc2rcMutex = NULL;
 Thread::Mutex *th2rcMutex = NULL;
 
+void InitDispatchLoader( Dispatch::Global & );
+
 Init::Init()
 {
   atexit(atExit);
 
-  void InitDispatchGlobalLoader( Dispatch::Global & );
-  InitDispatchGlobalLoader( dispatchGlobal );
+  InitDispatchLoader( dispatchGlobal );
   
 #if !defined(REGAL_NAMESPACE) && REGAL_SYS_WGL
   // Check our phony advapi32.dll, gdi32.dll and user32.dll dependencies