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

List:       helix-datatype-dev
Subject:    Re: [datatype-dev] CR-Client: fix build 310atlas Linux build buster
From:       Greg Wright <gwright () real ! com>
Date:       2008-01-29 21:31:21
Message-ID: 479F9B29.2000400 () real ! com
[Download RAW message or body]

Looks good.
--greg.



Eric Hyche wrote:
> 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.22
> diff -u -w -u -w -r1.27.2.22 flash_guest_player_ns.cpp
> --- flash_guest_player_ns.cpp   28 Jan 2008 03:37:06 -0000      1.27.2.22
> +++ flash_guest_player_ns.cpp   29 Jan 2008 19:46:47 -0000
> @@ -2054,7 +2054,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
> @@ -3813,12 +3813,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;
>  }
> 
> 
> =============================================
> Eric Hyche (ehyche@real.com)
> Technical Lead
> RealNetworks, Inc. 
> 
> 
> _______________________________________________
> Datatype-dev mailing list
> Datatype-dev@helixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/datatype-dev
> 


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