From 4b81fe1d285da879404f9f2c41cdf7748f2fc328 Mon Sep 17 00:00:00 2001
From: Paul Cadach <paul@odt.east.telecom.kz>
Date: Mon, 25 Sep 2006 06:15:24 +0000
Subject: [PATCH] Merged revisions 43472,43495 from trunk

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_h323.c        | 4 ++--
 channels/h323/caps_h323.cxx | 2 ++
 channels/h323/compat_h323.h | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 529a00b513..f60da0fe8d 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -2676,7 +2676,7 @@ static int reload_config(int is_reload)
 	struct oh323_alias *alias = NULL;
 	struct ast_hostent ahp; struct hostent *hp;
 	char *cat;
-	char *utype;
+	const char *utype;
 	int is_user, is_peer, is_alias;
 	char _gatekeeper[100];
 	int gk_discover, gk_disable, gk_changed;
@@ -2721,7 +2721,7 @@ static int reload_config(int is_reload)
 	if (ucfg) {
 		struct ast_variable *gen;
 		int genhas_h323;
-		char *has_h323;
+		const char *has_h323;
 
 		genhas_h323 = ast_true(ast_variable_retrieve(ucfg, "general", "hash323"));
 		gen = ast_variable_browse(ucfg, "general");
diff --git a/channels/h323/caps_h323.cxx b/channels/h323/caps_h323.cxx
index 7e9420691f..a420825a39 100644
--- a/channels/h323/caps_h323.cxx
+++ b/channels/h323/caps_h323.cxx
@@ -1,5 +1,7 @@
 #include <ptlib.h>
 #include <h323.h>
+#include <h245.h>
+#include "ast_h323.h"
 #include "caps_h323.h"
 
 #define DEFINE_G711_CAPABILITY(cls, code, capName) \
diff --git a/channels/h323/compat_h323.h b/channels/h323/compat_h323.h
index 2ea640c4a9..63da8ac8cc 100644
--- a/channels/h323/compat_h323.h
+++ b/channels/h323/compat_h323.h
@@ -52,7 +52,7 @@ template <class _Abstract_T, typename _Key_T = PString>
 class MyPFactory: public PFactory<_Abstract_T, _Key_T>
 {
 public:
-	template <class _Contrete_T> class Worker: public PFactory<_Abstract_T, _Key_T>::WorkerBase
+	template <class _Concrete_T> class Worker: public PFactory<_Abstract_T, _Key_T>::WorkerBase
 	{
 	public:
 		Worker(const _Key_T &_key, bool singleton = false)
@@ -64,6 +64,8 @@ public:
 		{
 			PFactory<_Abstract_T, _Key_T>::Unregister(key);
 		}
+	protected:
+		virtual _Abstract_T *Create(const _Key_T &) const { return new _Concrete_T; }
 
 	private:
 		PString key;