--- a/javacommons/utils/inc.s60/java_stdcpp_support_for_dll.hrh	Wed Sep 15 12:05:25 2010 +0300
+++ b/javacommons/utils/inc.s60/java_stdcpp_support_for_dll.hrh	Wed Oct 13 14:23:59 2010 +0300
@@ -49,6 +49,9 @@
 macro J9EPOC32
 #define J9EPOC32
 
+macro RD_JAVA_OMJ_FSERVER
+#define RD_JAVA_OMJ_FSERVER
+
 #include "build_defines.hrh"
 
 #ifdef RD_JAVA_STDCPPV5
@@ -59,10 +62,5 @@
   OS_LAYER_STDCPP_SYSTEMINCLUDE
   LIBRARY libstdcpp.lib
 #endif
-#ifndef RD_JAVA_NO_BIN_VERSION
-#ifdef RD_JAVA_BIN_VERSION_NONQT
-  VERSION RD_JAVA_BIN_VERSION_NONQT
-#endif
-#endif
 
 #endif // JAVA_STDCPP_SUPPORT_FOR_DLL_HRH