Browse Source

* android: Explicitly specified import library name.

git-svn-id: trunk@34333 -
yury 9 years ago
parent
commit
5e9d826d04
1 changed files with 14 additions and 12 deletions
  1. 14 12
      rtl/android/unixandroid.inc

+ 14 - 12
rtl/android/unixandroid.inc

@@ -30,12 +30,12 @@ type
           true  : (__tm_gmtoff : longint;__tm_zone : Pchar);
           true  : (__tm_gmtoff : longint;__tm_zone : Pchar);
 	 end;
 	 end;
 
 
-function localtime(t: PLongInt): Ptm; cdecl; external;
+function localtime(t: PLongInt): Ptm; cdecl; external 'c' name 'localtime';
 
 
 var
 var
-  c_tzname: array[0..1] of PAnsiChar; external name 'tzname';
-  c_timezone: longint; external name 'timezone';
-  c_daylignt: shortint; external name 'daylight';
+  c_tzname: array[0..1] of PAnsiChar; external 'c' name 'tzname';
+  c_timezone: longint; external 'c' name 'timezone';
+  c_daylignt: shortint; external 'c' name 'daylight';
 
 
 procedure InitLocalTime;
 procedure InitLocalTime;
 var
 var
@@ -46,12 +46,14 @@ begin
   tt:=localtime(@t);
   tt:=localtime(@t);
   tzname[false]:=c_tzname[0];
   tzname[false]:=c_tzname[0];
   tzname[true]:=c_tzname[1];
   tzname[true]:=c_tzname[1];
-  if tt <> nil then begin
-    tzdaylight:=tt^.tm_isdst <> 0;
-    tzseconds:=tt^.tm_gmtoff;
-  end
-  else begin
-    tzdaylight:=c_daylignt <> 0;
-    tzseconds:=-c_timezone;
-  end;
+  if tt <> nil then
+    begin
+      tzdaylight:=tt^.tm_isdst <> 0;
+      tzseconds:=tt^.tm_gmtoff;
+    end
+  else
+    begin
+      tzdaylight:=c_daylignt <> 0;
+      tzseconds:=-c_timezone;
+    end;
 end;
 end;