Merged revisions 11873 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
  r11873 | karoly | 2008-10-10 09:10:21 +0200 (Fri, 10 Oct 2008) | 2 lines
  
  * another attempt to properly fix the fix for 8391
........

git-svn-id: branches/fixes_2_2@11876 -

compiler/pdecsub.pas

@@ -2194,8 +2194,13 @@ const
                     if s<>'' then
                       begin
                         { Replace ? and @ in import name }
-                        Replace(s,'?','__q$$');
-                        Replace(s,'@','__a$$');
+                        { these replaces broke existing code on i386-win32 at least, while fixed 
+                          bug 8391 on arm-wince so limit this to arm-wince (KB) }
+                        if target_info.system in [system_arm_wince] then 
+                          begin
+                            Replace(s,'?','__q$$');
+                            Replace(s,'@','__a$$');
+                          end;
                         pd.setmangledname(s);
                       end;
                   end;