Merged revisions 7768 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r7768 | yury | 2007-06-22 02:22:48 +0300 (Пт, 22 июн 2007) | 1 line
  
  * fixed tw8391.pp for i386.
........

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

compiler/ogbase.pas

@@ -1360,8 +1360,8 @@ implementation
         FIsVar:=AIsVar;
         FMangledName:=AName;
         { Replace ? and @ in import name }
-        Replace(FMangledName,'?','$_q_$');
-        Replace(FMangledName,'@','$_a_$');
+        Replace(FMangledName,'?','__q$$');
+        Replace(FMangledName,'@','__a$$');
       end;
 
 

compiler/pdecsub.pas

@@ -2193,8 +2193,8 @@ const
                     if s<>'' then
                       begin
                         { Replace ? and @ in import name }
-                        Replace(s,'?','$_q_$');
-                        Replace(s,'@','$_a_$');
+                        Replace(s,'?','__q$$');
+                        Replace(s,'@','__a$$');
                         pd.setmangledname(s);
                       end;
                   end;