[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs]
From:       ehyche () helixcommunity ! org
Date:       2008-01-31 15:02:34
Message-ID: 200801311503.m0VF3N9g000660 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/flash/flashhost
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11279

Modified Files:
      Tag: hxclient_3_1_0_atlas
	flash_guest_player_ns.cpp 
Log Message:
Description
------------------------------------------
This change fixes two build busters on Linux
in datatype/flash/flashhost.

Files Modified
------------------------------------------
datatype/flash/flashhost/flash_guest_player_ns.cpp

Branches
------------------------------------------
HEAD and 310Atlas



Index: flash_guest_player_ns.cpp
===================================================================
RCS file: /cvsroot/datatype/flash/flashhost/flash_guest_player_ns.cpp,v
retrieving revision 1.27.2.23
retrieving revision 1.27.2.24
diff -u -d -r1.27.2.23 -r1.27.2.24
--- flash_guest_player_ns.cpp	30 Jan 2008 18:03:30 -0000	1.27.2.23
+++ flash_guest_player_ns.cpp	31 Jan 2008 14:59:07 -0000	1.27.2.24
@@ -2059,7 +2059,7 @@
 #if defined(_MAC_UNIX)
 	m_NPPort.port = (CGrafPtr) GetGrafPortFromHXWindow(m_pWindow);
 	m_NPWindow.window = &m_NPPort; // Platform specific window handle, NP_Port pointer on OS-X
-#else	// _MAC_UNIX
+#elif defined(_WINDOWS)
 	if (m_bWindowless)
 	{
 	    //XXX Windowless & siteless
@@ -3819,12 +3819,16 @@
 
     if (obj && obj->_class && obj->_class->invoke)
     {
+#if defined(_WINDOWS) || defined(_MAC_UNIX)
 	try {
+#endif
             bRes = obj->_class->invoke(obj, methodName, args, argCount, result);
+#if defined(_WINDOWS) || defined(_MAC_UNIX)
 	} catch (...) {
     	    HXLOGL4(HXLOG_FPHR, "NPN_Invoke FAILED %s args = %s", (char*) methodName, 
 	    		(argCount) ? NPVARIANT_TO_STRING(args[0]).utf8characters : "null");
         }
+#endif
     }
     return bRes;
 }


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]