* small compiling problems fixed

compiler/cg386ld.pas

@@ -354,9 +354,12 @@ implementation
               if is_shortstring(p^.left^.resulttype) and
                 not (p^.concat_string) then
                 begin
+{$ifdef UseAnsiString}
                   if is_ansistring(p^.right^.resulttype) then
                     loadansi2short(p^.right,p^.left)
                   else
+{$endif UseAnsiString}
+
                     begin
                        { we do not need destination anymore }
                        del_reference(p^.left^.location.reference);
@@ -559,7 +562,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.16  1998-09-20 17:46:48  florian
+  Revision 1.17  1998-09-20 18:00:19  florian
+    * small compiling problems fixed
+
+  Revision 1.16  1998/09/20 17:46:48  florian
     * some things regarding ansistrings fixed
 
   Revision 1.15  1998/09/17 09:42:16  peter

compiler/daopt386.pas

@@ -197,7 +197,7 @@ Implementation
 
 Uses globals, systems, strings, verbose, hcodegen,
    {$ifdef i386}
-     cgi386;
+     pass_2;
    {$endif i386}
 
 Const AsmInstr: Array[tasmop] Of TAsmInstrucProp = (
@@ -1614,7 +1614,10 @@ End.
 
 {
  $Log$
- Revision 1.14  1998-09-20 17:12:36  jonas
+ Revision 1.15  1998-09-20 18:00:20  florian
+   * small compiling problems fixed
+
+ Revision 1.14  1998/09/20 17:12:36  jonas
  * small fix for uncertain optimizations & more cleaning up
 
  Revision 1.12  1998/09/16 18:00:01  jonas

compiler/pass_1.pas

@@ -500,8 +500,8 @@ unit pass_1;
                 doconv:=tc_equal;
                 b:=true;
              end
-
          else
+           }
            { ansi- and wide strings can be assigned to void pointers }
            { no, (FK)
            if (def_from^.deftype=stringdef) and
@@ -513,7 +513,6 @@ unit pass_1;
                 doconv:=tc_equal;
                 b:=true;
              end
-
          else
            }
            { ansistrings can be assigned to pchar
@@ -5515,7 +5514,10 @@ unit pass_1;
 end.
 {
   $Log$
-  Revision 1.86  1998-09-20 17:46:50  florian
+  Revision 1.87  1998-09-20 18:00:21  florian
+    * small compiling problems fixed
+
+  Revision 1.86  1998/09/20 17:46:50  florian
     * some things regarding ansistrings fixed
 
   Revision 1.85  1998/09/17 09:42:38  peter