diff -r f5050f1da672 -r 04becd199f91 javacommons/utils/inc.s60/java_stdcpp_support_for_dll.hrh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javacommons/utils/inc.s60/java_stdcpp_support_for_dll.hrh	Tue Apr 27 16:30:29 2010 +0300
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Predefined macro definitions to be used in the mmp-files
+*
+*/
+
+/* 
+* Include the correct version of this file based on your TARGETTYPE. 
+* As an example, if the targettype is DLL, have the following line
+* in the corresponding MMP file:
+*
+*     #include <java_stdcpp_support_for_dll.hrh>
+*
+*/
+
+#ifndef JAVA_STDCPP_SUPPORT_FOR_DLL_HRH
+#define JAVA_STDCPP_SUPPORT_FOR_DLL_HRH
+
+#include <platform_paths.hrh>
+
+OPTION ARMCC --diag_suppress 1135
+
+APP_LAYER_SYSTEMINCLUDE
+
+OS_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_SSL_SYSTEMINCLUDE
+
+#include "java_capabilities.hrh"
+
+LIBRARY euser.lib
+LIBRARY javautils.lib
+LIBRARY libc.lib
+LIBRARY libpthread.lib
+  
+OPTION CW -wchar_t on
+MACRO  _WCHAR_T_DECLARED
+
+macro J9EPOC32
+#define J9EPOC32
+
+macro RD_JAVA_OMJ_FSERVER
+#define RD_JAVA_OMJ_FSERVER
+
+#include "build_defines.hrh"
+
+#ifdef RD_JAVA_STDCPPV5
+  SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)
+  LIBRARY libstdcppv5.lib
+  STDCPP
+#else
+  OS_LAYER_STDCPP_SYSTEMINCLUDE
+  LIBRARY libstdcpp.lib
+#endif
+
+#endif // JAVA_STDCPP_SUPPORT_FOR_DLL_HRH