Re: [Nokia-private-dev] CR:- Changes made to helix client source to use LIBC.DLL instead of ESTLIB.DLL on Symbian.

Gregory Wright <[email protected]> Tue, 1 Sep 2009 07:31:18 -0700
Newsgroups	gmane.comp.multimedia.helix.devel
Message-ID	<[email protected]>
Looks good.
--greg.

On Aug 28, 2009, at 3:15 PM, [email protected] wrote:

> "Nokia submits this code under the terms of a commercial  
> contribution agreement with Real Networks, and I am authorized to  
> contribute this code under said agreement."
>
> Modified by: [email protected]
>
> Reviewed by:
>
> Date: 08/26/2009
>
> Project: symbianMmf_wm
>
> ErrorId: N/A
>
> Synopsis: Changes made to helix client source to use LIBC.DLL  
> instead of ESTLIB.DLL on Symbian.
>
> Overview:  Helix build system configuration flag  
> HELIX_CONFIG_SYMBIAN_USE_STDAPIS enables usage of LIBC.DLL instead  
> of ESTLIB.DLL on Symbian. Made the following changes to source to  
> link with LIBC.DLL.
>
> 1) There is no need to call CloseSTDLIB() when using LIBC.DLL and  
> removed this function call from the following files when  
> HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
>     cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
>     cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
>     cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
>     cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
>     cvsroot/datatype/tools/metadataeng/engine/platform/symbian/ 
> symbian_metadataeng.cpp
>
> 2) LIBC.DLL has supports for wide character implementation and  
> removed implementation specific to this from the following file when  
> HELIX_CONFIG_SYMBIAN_USE_STDAPIS flag is enabled.
>      cvsroot/common/runtime/symbian.pcf
>      cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/ 
> client/helix/helix_win32_functions.h
>      cvsroot/common/runtime/pub/hlxclib/wchar.h
>
> 3) LIBC.DLL provides implementation for some standard functions/ 
> variables those were not available in estlib.dll and made changes to  
> the following files to use those functions instead of the one  
> provided in helix.
>      cvsroot/common/include/hxtypes.h
>      cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
>      cvsroot/common/netio/pub/platform/symbian/nettypes.h
>      cvsroot/common/runtime/pub/hlxclib/stdio.h
>      cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
>
> 4) Removed estlib.lib, euser.lib and hal.lib from the following  
> files as these files get added by default for symbian platform
>      cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
>      cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
>      cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
>      cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
>
> 5) offsetof marco implementation provided in stdapis\stddef.h, when  
> it used inside existing helix template definition causing  
> compilation failure. Libc\stddef.h has a different implementation  
> from stdapis\stddef.h.
>      So added Libc\stddef.h offsetof macro definition to hlxclib/ 
> stddef.h to avoid this failure and use the one provided in Libc 
> \stddef.h.
>
> 6) Made changes to the following files to use offsetof macro  
> definition in hlxclib/stddef.h
>     cvsroot/common/import/expat/xmlparse/xmlparse.c
>     cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/ 
> client/common/netbuffer.h
>
> 7) estlib.lib, euser.lib and hal.lib files get added by default for  
> symbian platform. So there is no need to add these files and removed  
> them from the following symbian.pcf files
>     cvsroot/datatype/mp3/fileformat/symbian.pcf
>     cvsroot/datatype/mp3/renderer/symbian.pcf
>
> Files modified:
>     cvsroot/audio/device/platform/symbian/audiosvr/audio_svr_cntxt.cpp
>     cvsroot/common/system/platform/symbian/CHXSymbianServer.cpp
>     cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp
>     cvsroot/clientapps/symbianMmf/videocontroller/hxmmfctrlimpl.cpp
>     cvsroot/datatype/tools/metadataeng/engine/platform/symbian/ 
> symbian_metadataeng.cpp
>     cvsroot/common/runtime/symbian.pcf
>     cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/ 
> client/helix/helix_win32_functions.h
>     cvsroot/common/runtime/pub/hlxclib/wchar.h
>     cvsroot/common/include/hxtypes.h
>     cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp
>     cvsroot/common/netio/pub/platform/symbian/nettypes.h
>     cvsroot/common/runtime/pub/hlxclib/stdio.h
>     cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp
>     cvsroot/clientapps/symbianMmf/audiocontroller/controllerdll
>     cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll
>     cvsroot/clientapps/symbianMmf/wmvextcontroller/wmaextctrldll
>     cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtCtrlDll
>     cvsroot/common/import/expat/xmlparse/xmlparse.c
>     cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/network/ 
> client/common/netbuffer.h
>     cvsroot/common/runtime/pub/hlxclib/stddef.h
>
> Files removed:
>     cvsroot/datatype/mp3/fileformat/symbian.pcf
>     cvsroot/datatype/mp3/renderer/symbian.pcf
>
> Files added: None
>
> Image Size and Heap Use impact: N/A
>
> Module Release testing (STIF) : N/A
>
> Test case(s) Added  : N/A
>
> Memory leak check performed : N/A
>
> Platforms and Profiles Build Verified: helix-client-s60-52-ng
>
> Platforms and Profiles verified: armv5, winscw
>
> Branch: HEAD
>
> Index: audio_svr_cntxt.cpp
> ===================================================================
> RCS file: /cvsroot/audio/device/platform/symbian/audiosvr/ 
> audio_svr_cntxt.cpp,v
> retrieving revision 1.10
> diff -u -w -r1.10 audio_svr_cntxt.cpp
> --- audio_svr_cntxt.cpp 6 Jul 2007 20:21:13 -0000       1.10
> +++ audio_svr_cntxt.cpp 25 Aug 2009 21:09:45 -0000
> @@ -270,7 +270,9 @@
>      delete pCleanupTrap;
>
>      // clean up memory allocated by stdlib functions
> +#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
>      CloseSTDLIB();
> +#endif
>
>      // reset thread members in case this thread is restarted
>      pArgs->pCtx->m_running = false;
>
> Index: CHXSymbianServer.cpp
> ===================================================================
> RCS file: /cvsroot/common/system/platform/symbian/ 
> CHXSymbianServer.cpp,v
> retrieving revision 1.2
> diff -u -w -r1.2 CHXSymbianServer.cpp
> --- CHXSymbianServer.cpp        25 Jan 2008 22:07:14 -0000      1.2
> +++ CHXSymbianServer.cpp        25 Aug 2009 21:35:35 -0000
> @@ -254,7 +254,9 @@
>      REComSession::FinalClose();
>
>      // clean up memory allocated by stdlib functions
> +#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
>      CloseSTDLIB();
> +#endif
>
>      SERVER_LOG( (_L("CHXSymbianServerCtx[%x]::ThreadEntry -->  
> Thread Death"), obj) );
>      return KErrNone;
>
> Index: symbian.pcf
> ===================================================================
> RCS file: /cvsroot/common/runtime/symbian.pcf,v
> retrieving revision 1.6
> diff -u -w -r1.6 symbian.pcf
> --- symbian.pcf 17 Oct 2007 23:04:07 -0000      1.6
> +++ symbian.pcf 26 Aug 2009 17:03:33 -0000
> @@ -50,4 +50,5 @@
> #
>
> project.AddSources("platform/symbian/process_events.cpp")
> +if not project.IsDefined('HELIX_CONFIG_SYMBIAN_USE_STDAPIS'):
> project.AddSources("platform/symbian/symbian_wchar_functions.cpp")
>
> Index: controllerdll
> ===================================================================
> RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/ 
> controllerdll,v
> retrieving revision 1.10
> diff -u -w -r1.10 controllerdll
> --- controllerdll       29 Jan 2009 21:46:21 -0000      1.10
> +++ controllerdll       26 Aug 2009 17:33:56 -0000
> @@ -97,14 +97,11 @@
>      "MMFDEVSOUND.LIB",
>      "WS32.LIB",
>      "EFSRV.LIB",
> -    "EUSER.LIB",
>      "INSOCK.LIB",
>      "CONNMON.LIB",
>      "ESOCK.LIB",
>      "BAFL.LIB",
>      "COMMDB.LIB",
> -    "ESTLIB.LIB",
> -    "HAL.LIB",
>      "COMMONENGINE.LIB",
>      "APSETTINGSHANDLERUI.LIB",
>      "EIKCORE.LIB",
> @@ -149,14 +146,11 @@
>                                  "MMFDEVSOUND.LIB(VtblExports.o)",
>                                  "WS32.LIB(VtblExports.o)",
>                                  "EFSRV.LIB(VtblExports.o)",
> -                                "EUSER.LIB(VtblExports.o)",
>                                  "INSOCK.LIB(VtblExports.o)",
>                                  "CONNMON.LIB(VtblExports.o)",
>                                  "ESOCK.LIB(VtblExports.o)",
>                                  "BAFL.LIB(VtblExports.o)",
>                                  "COMMDB.LIB(VtblExports.o)",
> -                                "ESTLIB.LIB(VtblExports.o)",
> -                                "HAL.LIB(VtblExports.o)",
>                                  "COMMONENGINE.LIB(VtblExports.o)",
>                                  "APSETTINGSHANDLERUI.LIB 
> (VtblExports.o)",
>                                  "EIKCORE.LIB(VtblExports.o)",
>
> Index: helix_win32_functions.h
> ===================================================================
> RCS file: /cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/ 
> network/client/helix/helix_win32_functions.h,v
> retrieving revision 1.9
> diff -u -w -r1.9 helix_win32_functions.h
> --- helix_win32_functions.h     23 Apr 2009 21:08:40 -0000      1.9
> +++ helix_win32_functions.h     25 Aug 2009 21:52:56 -0000
> @@ -60,11 +60,11 @@
> #else /* #if defined(_WINDOWS) */
>
> // This include file is needed to define all the Win32 types.
> -#ifndef _SYMBIAN
> +#if !defined(_SYMBIAN)  || defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> #include "hlxclib/wchar.h"
> #endif
> #include <ctype.h>
> -#ifndef _SYMBIAN
> +#if !defined(_SYMBIAN)  || defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> #include <wctype.h>
> #endif
> #include <sys/time.h>
> @@ -77,7 +77,7 @@
> #include "timerep.h"
> #include "hxassert.h"
>
> -#ifdef _SYMBIAN
> +#if defined(_SYMBIAN) && !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> #include "symbian_wchar_functions.h"
> #endif
> #ifndef _SYMBIAN
>
> Index: hxmmfaudioctrl.cpp
> ===================================================================
> RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/ 
> hxmmfaudioctrl.cpp,v
> retrieving revision 1.31
> diff -u -w -r1.31 hxmmfaudioctrl.cpp
> --- hxmmfaudioctrl.cpp  9 Jun 2009 20:21:39 -0000       1.31
> +++ hxmmfaudioctrl.cpp  26 Aug 2009 14:54:00 -0000
> @@ -121,7 +121,9 @@
>      }
>      delete m_pActiveSchedulerWait;
>      delete m_pCustomInterface;
> +#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
>      CloseSTDLIB();
> +#endif
> }
>
> void
>
> Index: hxmmfctrlimpl.cpp
> ===================================================================
> RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/ 
> hxmmfctrlimpl.cpp,v
> retrieving revision 1.90
> diff -u -w -r1.90 hxmmfctrlimpl.cpp
> --- hxmmfctrlimpl.cpp   9 Jun 2009 20:21:39 -0000       1.90
> +++ hxmmfctrlimpl.cpp   26 Aug 2009 14:56:08 -0000
> @@ -138,7 +138,9 @@
>          HXGlobalManInstance::SetInstance(0);
>      }
>
> +#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
>      CloseSTDLIB();
> +#endif
> }
>
> void
>
> Index: hxtypes.h
> ===================================================================
> RCS file: /cvsroot/common/include/hxtypes.h,v
> retrieving revision 1.45
> diff -u -w -r1.45 hxtypes.h
> --- hxtypes.h   29 Jul 2009 16:19:15 -0000      1.45
> +++ hxtypes.h   25 Aug 2009 21:18:49 -0000
> @@ -221,8 +221,12 @@
> #endif
>
> #if defined(_SYMBIAN)
> +#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> +#include <sys/param.h>
> +#else
> #define PATH_MAX      KMaxPath
> #endif
> +#endif
>
> #ifdef __cplusplus
> extern "C" {            /* Assume C declarations for C++ */
>
> Index: id3_field_binary.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/mp3/import/id3lib/id3_field_binary.cpp,v
> retrieving revision 1.2
> diff -u -w -r1.2 id3_field_binary.cpp
> --- id3_field_binary.cpp        8 Feb 2008 18:26:27 -0000       1.2
> +++ id3_field_binary.cpp        25 Aug 2009 21:40:01 -0000
> @@ -12,7 +12,7 @@
>
>
> #include <stdio.h>
> -#if (!defined _SYMBIAN)
> +#if !defined(_SYMBIAN) || defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> #include <memory.h>
> #endif
> #include "id3_field.h"
>
> Index: MmfCtrlDll
> ===================================================================
> RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/MmfCtrlDll,v
> retrieving revision 1.14
> diff -u -w -r1.14 MmfCtrlDll
> --- MmfCtrlDll  29 Jan 2009 21:47:06 -0000      1.14
> +++ MmfCtrlDll  26 Aug 2009 17:37:17 -0000
> @@ -97,14 +97,11 @@
>      "MMFDEVSOUND.LIB",
>      "WS32.LIB",
>      "EFSRV.LIB",
> -    "EUSER.LIB",
>      "INSOCK.LIB",
>      "CONNMON.LIB",
>      "ESOCK.LIB",
>      "BAFL.LIB",
>      "COMMDB.LIB",
> -    "ESTLIB.LIB",
> -    "HAL.LIB",
>      "COMMONENGINE.LIB",
>      "APSETTINGSHANDLERUI.LIB",
>      "EIKCORE.LIB",
> @@ -149,14 +146,11 @@
>                                  "MMFDEVSOUND.LIB(VtblExports.o)",
>                                  "WS32.LIB(VtblExports.o)",
>                                  "EFSRV.LIB(VtblExports.o)",
> -                                "EUSER.LIB(VtblExports.o)",
>                                  "INSOCK.LIB(VtblExports.o)",
>                                  "CONNMON.LIB(VtblExports.o)",
>                                  "ESOCK.LIB(VtblExports.o)",
>                                  "BAFL.LIB(VtblExports.o)",
>                                  "COMMDB.LIB(VtblExports.o)",
> -                                "ESTLIB.LIB(VtblExports.o)",
> -                                "HAL.LIB(VtblExports.o)",
>                                  "COMMONENGINE.LIB(VtblExports.o)",
>                                  "APSETTINGSHANDLERUI.LIB 
> (VtblExports.o)",
>                                  "EIKCORE.LIB(VtblExports.o)",
>
> Index: netbuffer.h
> ===================================================================
> RCS file: /cvsroot/wmcode-protocol/rtsp/import/wmrtsp-porting-kit/ 
> network/client/common/netbuffer.h,v
> retrieving revision 1.3
> diff -u -w -r1.3 netbuffer.h
> --- netbuffer.h 23 Oct 2006 20:05:32 -0000      1.3
> +++ netbuffer.h 26 Aug 2009 17:17:56 -0000
> @@ -21,7 +21,7 @@
> #include "wmspacket.h"
> #endif
>
> -#include <stddef.h>
> +#include "hlxclib/stddef.h"
> #include "tentrylist.h"
> #include "incrementalalloc.h"
>
> Index: nettypes.h
> ===================================================================
> RCS file: /cvsroot/common/netio/pub/platform/symbian/nettypes.h,v
> retrieving revision 1.3
> diff -u -w -r1.3 nettypes.h
> --- nettypes.h  6 Jul 2007 20:43:59 -0000       1.3
> +++ nettypes.h  25 Aug 2009 21:22:42 -0000
> @@ -49,14 +49,17 @@
>
> #ifndef NETTYPES_H__
> #define NETTYPES_H__
> -
> +#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> +#include <arpa/inet.h>
> +#include <sys/un.h>
> +#endif
> #include <in_sock.h>
> #include <sys/types.h>
> #include <sys/socket.h>
> #include <netinet/in.h>
> #include <string.h> // memcmp
> #include "hxtypes.h"
> -
> +#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> // Provides posix data structures missing from standard Symbian  
> headers. Even though
> // Symbian does not provide a posix socket API, these are useful for  
> address representation
> // in generic cross-platfrom code.
> @@ -224,7 +227,5 @@
>      return ((a->sin6_family == AF_INET6) &&
>              IN6_IS_ADDR_LOOPBACK(&a->sin6_addr));
> }
> -
> -
> -
> +#endif
> #endif /* NETTYPES_H__ */
>
> Index: stddef.h
> ===================================================================
> RCS file: /cvsroot/common/runtime/pub/hlxclib/stddef.h,v
> retrieving revision 1.4
> diff -u -w -r1.4 stddef.h
> --- stddef.h    6 Jul 2007 20:44:04 -0000       1.4
> +++ stddef.h    25 Aug 2009 21:28:21 -0000
> @@ -59,6 +59,10 @@
>
> #include <stddef.h>
>
> +#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> +#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
> +#endif
> +
> #ifdef LIMITS_UNDEF_WIN32
> #undef _WIN32
> #undef LIMITS_UNDEF_WIN32
>
> Index: stdio.h
> ===================================================================
> RCS file: /cvsroot/common/runtime/pub/hlxclib/stdio.h,v
> retrieving revision 1.11
> diff -u -w -r1.11 stdio.h
> --- stdio.h     18 Jan 2008 09:17:27 -0000      1.11
> +++ stdio.h     25 Aug 2009 21:31:04 -0000
> @@ -245,9 +245,11 @@
> #define vsnprintf _vsnprintf
>
> #elif defined(_SYMBIAN) || defined(_WINCE) || defined(_IRIX)
> +#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> #define snprintf __helix_snprintf
> #define vsnprintf __helix_vsnprintf
> #endif
> +#endif
>
> #if    __cplusplus
> }
>
> Index: symbian_metadataeng.cpp
> ===================================================================
> RCS file: /cvsroot/datatype/tools/metadataeng/engine/platform/ 
> symbian/symbian_metadataeng.cpp,v
> retrieving revision 1.11
> diff -u -w -r1.11 symbian_metadataeng.cpp
> --- symbian_metadataeng.cpp     4 Mar 2009 01:00:35 -0000       1.11
> +++ symbian_metadataeng.cpp     25 Aug 2009 21:43:31 -0000
> @@ -619,7 +619,9 @@
>          HXGlobalManInstance::SetInstance(0);
>      }
>
> +#if !defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
>      CloseSTDLIB();
> +#endif
>      m_bDestroyed = TRUE;
> }
>
> Index: symbihxdataf.cpp
> ===================================================================
> RCS file: /cvsroot/common/fileio/platform/symbian/symbihxdataf.cpp,v
> retrieving revision 1.15
> diff -u -w -r1.15 symbihxdataf.cpp
> --- symbihxdataf.cpp    6 Jul 2007 20:35:15 -0000       1.15
> +++ symbihxdataf.cpp    25 Aug 2009 21:15:38 -0000
> @@ -50,6 +50,9 @@
> / 
> ****************************************************************************
>   *  Includes
>   */
> +#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> +#include "hlxclib/sys/stat.h"
> +#endif
> #include "hlxclib/string.h"
> #include "hlxclib/fcntl.h"
>
> Index: wchar.h
> ===================================================================
> RCS file: /cvsroot/common/runtime/pub/hlxclib/wchar.h,v
> retrieving revision 1.8
> diff -u -w -r1.8 wchar.h
> --- wchar.h     9 Apr 2009 23:01:40 -0000       1.8
> +++ wchar.h     25 Aug 2009 21:32:56 -0000
> @@ -67,8 +67,12 @@
> // the header has the inclusion for the wchar string operations
>
> #ifdef _SYMBIAN
> +#if defined(HELIX_CONFIG_SYMBIAN_USE_STDAPIS)
> +    #include <wchar.h>
> +#else
>      #include "platform/symbian/symbian_wchar_functions.h"
>      #include <libc/string.h>
> +#endif
> #elif _BREW
> #elif ANDROID
>      //Android has no wide-char support
>
> Index: wmaextctrldll
> ===================================================================
> RCS file: /cvsroot/clientapps/symbianMmf/wmvextcontroller/ 
> wmaextctrldll,v
> retrieving revision 1.7
> diff -u -w -r1.7 wmaextctrldll
> --- wmaextctrldll       30 Jan 2009 23:51:32 -0000      1.7
> +++ wmaextctrldll       26 Aug 2009 17:42:30 -0000
> @@ -109,14 +109,11 @@
>      "MMFDEVSOUND.LIB",
>      "WS32.LIB",
>      "EFSRV.LIB",
> -    "EUSER.LIB",
>      "INSOCK.LIB",
>      "CONNMON.LIB",
>      "ESOCK.LIB",
>      "BAFL.LIB",
>      "COMMDB.LIB",
> -    "ESTLIB.LIB",
> -    "HAL.LIB",
>      "COMMONENGINE.LIB",
>      "APSETTINGSHANDLERUI.LIB",
>      "EIKCORE.LIB",
> @@ -168,14 +165,11 @@
>                                  "MMFDEVSOUND.LIB(VtblExports.o)",
>                                  "WS32.LIB(VtblExports.o)",
>                                  "EFSRV.LIB(VtblExports.o)",
> -                                "EUSER.LIB(VtblExports.o)",
>                                  "INSOCK.LIB(VtblExports.o)",
>                                  "CONNMON.LIB(VtblExports.o)",
>                                  "ESOCK.LIB(VtblExports.o)",
>                                  "BAFL.LIB(VtblExports.o)",
>                                  "COMMDB.LIB(VtblExports.o)",
> -                                "ESTLIB.LIB(VtblExports.o)",
> -                                "HAL.LIB(VtblExports.o)",
>                                  "COMMONENGINE.LIB(VtblExports.o)",
>                                  "APSETTINGSHANDLERUI.LIB 
> (VtblExports.o)",
>                                  "EIKCORE.LIB(VtblExports.o)",
>
> Index: WmvExtCtrlDll
> ===================================================================
> RCS file: /cvsroot/clientapps/symbianMmf/wmvextcontroller/ 
> WmvExtCtrlDll,v
> retrieving revision 1.8
> diff -u -w -r1.8 WmvExtCtrlDll
> --- WmvExtCtrlDll       30 Jan 2009 23:51:32 -0000      1.8
> +++ WmvExtCtrlDll       26 Aug 2009 17:43:14 -0000
> @@ -98,14 +98,11 @@
>      "MMFDEVSOUND.LIB",
>      "WS32.LIB",
>      "EFSRV.LIB",
> -    "EUSER.LIB",
>      "INSOCK.LIB",
>      "CONNMON.LIB",
>      "ESOCK.LIB",
>      "BAFL.LIB",
>      "COMMDB.LIB",
> -    "ESTLIB.LIB",
> -    "HAL.LIB",
>      "COMMONENGINE.LIB",
>      "APSETTINGSHANDLERUI.LIB",
>      "EIKCORE.LIB",
> @@ -151,14 +148,11 @@
>                                  "MMFDEVSOUND.LIB(VtblExports.o)",
>                                  "WS32.LIB(VtblExports.o)",
>                                  "EFSRV.LIB(VtblExports.o)",
> -                                "EUSER.LIB(VtblExports.o)",
>                                  "INSOCK.LIB(VtblExports.o)",
>                                  "CONNMON.LIB(VtblExports.o)",
>                                  "ESOCK.LIB(VtblExports.o)",
>                                  "BAFL.LIB(VtblExports.o)",
>                                  "COMMDB.LIB(VtblExports.o)",
> -                                "ESTLIB.LIB(VtblExports.o)",
> -                                "HAL.LIB(VtblExports.o)",
>                                  "COMMONENGINE.LIB(VtblExports.o)",
>                                  "APSETTINGSHANDLERUI.LIB 
> (VtblExports.o)",
>                                  "EIKCORE.LIB(VtblExports.o)",
>
> Index: xmlparse.c
> ===================================================================
> RCS file: /cvsroot/common/import/expat/xmlparse/xmlparse.c,v
> retrieving revision 1.8
> diff -u -w -r1.8 xmlparse.c
> --- xmlparse.c  24 Mar 2005 00:06:10 -0000      1.8
> +++ xmlparse.c  26 Aug 2009 17:15:21 -0000
> @@ -5,7 +5,7 @@
>
> #include "xmldef.h"
> #include "xmlparse.h"
> -#include <stddef.h>
> +#include "hlxclib/stddef.h"
>
> #ifdef _WINCE
> #ifndef _ABORT_DEFINED
>
> _______________________________________________
> Nokia-private-dev mailing list
> [email protected]
> http://lists.helixcommunity.org/mailman/listinfo/nokia-private-dev