Update of /cvsroot/player/hxclientkit/src/platform/mac
In directory cvs-new:/tmp/cvs-serv2345

Modified Files:
	HXErrorCodeStringsMac.c HXPlayerToObserver.m 
Log Message:
Merged 122 to Head.

Index: HXErrorCodeStringsMac.c
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/mac/HXErrorCodeStringsMac.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HXErrorCodeStringsMac.c	9 Jul 2004 18:25:05 -0000	1.6
+++ HXErrorCodeStringsMac.c	14 Jul 2004 20:56:33 -0000	1.7
@@ -47,7 +47,7 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#include "HXErrorCodeStringsMac.h"
+#include "HXClientCFuncs.h"
 #include "HXErrorCodeStrings.h"
 
 #include "enter_hx_headers.h"
@@ -55,7 +55,7 @@
 #include "exit_hx_headers.h"
 
 CFStringRef
-CreateErrorStringForHXCode( ULONG32 ulHXCode, const char* pErrorString )
+ClientCreateErrorString( ULONG32 ulHXCode, const char* pErrorString )
 {
 	CFStringRef errorString = nil;
 	

Index: HXPlayerToObserver.m
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/mac/HXPlayerToObserver.m,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- HXPlayerToObserver.m	9 Jul 2004 18:25:05 -0000	1.16
+++ HXPlayerToObserver.m	14 Jul 2004 20:56:33 -0000	1.17
@@ -50,7 +50,7 @@
 #import "HXClientCallbacks.h"
 #import "HXStringUtils.h"
 #import "HXErrorCodeStrings.h"
-#import "HXErrorCodeStringsMac.h"
+#import "HXClientCFuncs.h"
 #import "HXPlayerToObserver.h"
 
 #include "enter_hx_headers.h"
@@ -204,7 +204,7 @@
 {
 	if ( [(id)observer respondsToSelector:@selector( onErrorOccurred:msgString:params: )] )
 	{
-		CFStringRef errorString = CreateErrorStringForHXCode( hxCode, pErrorString );
+		CFStringRef errorString = ClientCreateErrorString( hxCode, pErrorString );
 		if ( errorString )
 		{
 			NSMutableDictionary* params = [NSMutableDictionary dictionary];