diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-31 13:29:58 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-31 13:29:58 +0000 |
| commit | a8022f1281ea607b598b8bc30cc06eec71791349 (patch) | |
| tree | 10012e7856220cfaf4ab1f30d7681354236337a8 /gcc/ada/g-socthi-mingw.adb | |
| parent | 12c194d128ff2100e47a076e3b47f38344e8a9c9 (diff) | |
| download | gcc-a8022f1281ea607b598b8bc30cc06eec71791349.tar.gz | |
2014-07-31 Pascal Obry <obry@adacore.com>
* a-stream.ads (Stream_Element_Offset): Now a signed 64bit type.
* i-cstrea.ads, s-crtl.ads (fseek64): Offset is always a 64bit value.
(ftell64): Always returns a 64bit value.
* cstreams.c (int64): New definition.
(_FILE_OFFSET_BITS): Set to 64 to enable 64bit offset support.
(__gnat_ftell64): Always returns a 64bit value. The implemenation now
uses ftello() on UNIX.
(__gnat_fseek64): Offset is always a 64bit value. The
implementation now uses fseeko() on UNIX.
* a-ststio.adb, s-direio.adb (Set_Position): Simplify code,
always use fseek64 to set the offset.
(Size): Simplify code, always use fseek64/ftell64.
* s-direio.ads (Count): Now an int64.
* g-socket.ads (Vector_Element): Adjust definition for Length
to be a size_t. This matches the C definition and avoid using
a 64bit integer on 32bit platforms now that Count is always 64bit.
* g-socthi-mingw.adb (Ada.Streams): Removed as not used anymore.
(C_Recvmsg): Change some conversion to account for change in
Vector_Element.
(C_Sendmsg): Likewise.
2014-07-31 Robert Dewar <dewar@adacore.com>
* cstand.adb (Create_Standard): Remove handling of -gnatdm flag.
* debug.adb: Remove documentation of -gnatdm flag.
* gnat1drv.adb (Adjust_Global_Switches): Remove handling of
-gnatdm flag.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213365 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/g-socthi-mingw.adb')
| -rw-r--r-- | gcc/ada/g-socthi-mingw.adb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gcc/ada/g-socthi-mingw.adb b/gcc/ada/g-socthi-mingw.adb index 719ab547755..e8ee6dcc630 100644 --- a/gcc/ada/g-socthi-mingw.adb +++ b/gcc/ada/g-socthi-mingw.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2013, AdaCore -- +-- Copyright (C) 2001-2014, AdaCore -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -35,7 +35,6 @@ -- This version is for NT -with Ada.Streams; use Ada.Streams; with Ada.Unchecked_Conversion; with Interfaces.C.Strings; use Interfaces.C.Strings; with System; use System; @@ -334,11 +333,11 @@ package body GNAT.Sockets.Thin is exit; else - pragma Assert (Stream_Element_Count (Res) <= Current_Iovec.Length); + pragma Assert (Interfaces.C.size_t (Res) <= Current_Iovec.Length); Count := Count + Res; Current_Iovec.Length := - Current_Iovec.Length - Stream_Element_Count (Res); + Current_Iovec.Length - Interfaces.C.size_t (Res); Current_Iovec.Base := To_Access (Current_Iovec.Base.all'Address + Storage_Offset (Res)); @@ -507,7 +506,7 @@ package body GNAT.Sockets.Thin is -- Exit now if the buffer is not fully transmitted - exit when Stream_Element_Count (Res) < Iovec (J).Length; + exit when Interfaces.C.size_t (Res) < Iovec (J).Length; end loop; return System.CRTL.ssize_t (Count); |