--- Merging r29619 into '.':

U    utils/unicode/fpmake.pp
--- Recording mergeinfo for merge of r29619 into '.':
 U   .
--- Merging r29642 into '.':
U    packages/libcurl/src/libcurl.pp
--- Recording mergeinfo for merge of r29642 into '.':
 G   .
--- Merging r29645 into '.':
U    packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r29645 into '.':
 G   .
--- Merging r29656 into '.':
G    packages/rtl-objpas/src/inc/variants.pp
--- Recording mergeinfo for merge of r29656 into '.':
 G   .

# revisions: 29619,29642,29645,29656

git-svn-id: branches/fixes_3_0@31089 -

packages/libcurl/src/libcurl.pp

@@ -20,7 +20,18 @@ unit libcurl;
 
 interface
 
-uses unixtype;
+{$IFDEF WINDOWS}
+uses
+  ctypes;
+
+type
+  time_t = clong;
+  PTime_t = ^time_t;
+  off_t  = clong;
+{$ELSE}
+uses
+  unixtype;
+{$ENDIF}
 
 {$IFDEF FPC}
 {$PACKRECORDS C}

packages/rtl-objpas/src/inc/variants.pp

@@ -2255,12 +2255,18 @@ begin
       Dest.vType := varString;
       Dest.vString := nil;
       AnsiString(Dest.vString) := AnsiString(vString);
+    end else if vType = varOleStr then begin
+      Dest.vType := varOleStr;
+      Dest.vOleStr := nil;
+      WideString(Pointer(Dest.vOleStr)) := WideString(Pointer(vOleStr));
     end else if vType = varAny then begin
       Dest := Source;
       RefAnyProc(Dest);
     end else if vType and varArray <> 0 then
       DoVarCopyArray(Dest, Source, @DoVarCopy)
-    else if (vType and varByRef <> 0) and (vType xor varByRef = varString) then
+    else if (vType and varByRef <> 0) and
+             (((vType xor varByRef) = varString)
+               or ((vType xor varByRef)= varOleStr)) then
       Dest := Source
     else if FindCustomVariantType(vType, Handler) then
       Handler.Copy(Dest, Source, False)

utils/unicode/fpmake.pp

@@ -21,6 +21,7 @@ begin
     P.License := 'LGPL with modification';
     P.HomepageURL := 'www.freepascal.org';
     P.Email := '';
+    P.Description := 'Utilities for processing the Unicode consortium data files for use with FPC.';
 
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;