summaryrefslogtreecommitdiff
path: root/gcc/ada/g-socthi-mingw.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2010-06-17 12:26:10 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2010-06-17 12:26:10 +0000
commit6cd460aa8dcb65ea8454257720dffd2258689ef8 (patch)
treeecc5a2780220e50090dbcb7bf568dc7f8e0391de /gcc/ada/g-socthi-mingw.adb
parent6b41190941cfa45ea129a7749c81d45115758712 (diff)
downloadgcc-6cd460aa8dcb65ea8454257720dffd2258689ef8.tar.gz
2010-06-17 Robert Dewar <dewar@adacore.com>
* exp_ch3.adb, exp_ch6.adb, exp_smem.adb, exp_util.adb: Use Ekind_In. * layout.adb, freeze.adb: Use Make_Temporary. 2010-06-17 Jerome Lambourg <lambourg@adacore.com> * exp_ch11.adb (Expand_N_Raise_Statement): Expand raise statements in .NET/JVM normally as this is now perfectly supported by the backend. 2010-06-17 Pascal Obry <obry@adacore.com> * gnat_rm.texi: Fix minor typo, remove duplicate blank lines. 2010-06-17 Vincent Celier <celier@adacore.com> * make.adb (Collect_Arguments_And_Compile): Create include path file only when -x is specified. (Gnatmake): Ditto * opt.ads (Use_Include_Path_File): New Boolean flag, initialized to False. * prj-env.adb (Set_Ada_Paths): New Boolean parameters Include_Path and Objects_Path, defaulted to True. Only create include path file if Include_Path is True, only create objects path file if Objects_Path is True. * prj-env.ads (Set_Ada_Paths): New Boolean parameters Include_Path and Objects_Path, defaulted to True. * switch-m.adb (Scan_Make_Switches): Set Use_Include_Path_File to True when -x is used. 2010-06-17 Ed Schonberg <schonberg@adacore.com> * exp_disp.adb (Build_Interface_Thunk): Use base type of formal to determine whether it has the controlling type, when the formal is an access parameter. 2010-06-17 Eric Botcazou <ebotcazou@adacore.com> * s-crtl.ads (ssize_t): New type. (read): Fix signature. (write): Likewise. * g-socthi.ads: Add 'with System.CRTL' clause. Remove ssize_t and 'use type' directive for C.size_t, add one for System.CRTL.ssize_t. (C_Recvmsg): Replace ssize_t with System.CRTL.ssize_t. (C_Sendmsg): Likewise. * g-socthi.adb (Syscall_Recvmsg): Likewise. (Syscall_Sendmsg): Likewise. (C_Recvmsg): Likewise. (C_Sendmsg): Likewise. * g-socthi-mingw.ads: Add 'with System.CRTL' clause. Remove ssize_t and 'use type' directive for C.size_t, add one for System.CRTL.ssize_t. (C_Recvmsg): Replace ssize_t with System.CRTL.ssize_t. (C_Sendmsg): Likewise. * g-socthi-mingw.adb (C_Recvmsg): Likewise. (C_Sendmsg): Likewise. * g-socthi-vms.ads: Add 'with System.CRTL' clause. Remove ssize_t and 'use type' directive for C.size_t, add one for System.CRTL.ssize_t. (C_Recvmsg): Replace ssize_t with System.CRTL.ssize_t. (C_Sendmsg): Likewise. * g-socthi-vms.adb (C_Recvmsg): Likewise. (C_Sendmsg): Likewise. * g-socthi-vxworks.ads Add 'with System.CRTL' clause. Remove ssize_t and 'use type' directive for C.size_t, add one for System.CRTL.ssize_t. (C_Recvmsg): Replace ssize_t with System.CRTL.ssize_t. (C_Sendmsg): Likewise. * g-socthi-vxworks.adb (C_Recvmsg): Likewise. (C_Sendmsg): Likewise. * g-sercom-linux.adb (Read): Use correct types to call 'read'. (Write): Likewise to call 'write'. * s-os_lib.adb (Read): Use correct type to call System.CRTL.read. (Write): Use correct type to call System.CRTL.write. * s-tasdeb.adb (Write): Likewise. 2010-06-17 Vincent Celier <celier@adacore.com> * prj-proc.adb (Copy_Package_Declarations): Change argument name Naming_Restricted to Restricted. If Restricted is True, do not copy the value of attribute Linker_Options. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160905 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/g-socthi-mingw.adb')
-rw-r--r--gcc/ada/g-socthi-mingw.adb48
1 files changed, 26 insertions, 22 deletions
diff --git a/gcc/ada/g-socthi-mingw.adb b/gcc/ada/g-socthi-mingw.adb
index 49df16363b3..ba4a3deb775 100644
--- a/gcc/ada/g-socthi-mingw.adb
+++ b/gcc/ada/g-socthi-mingw.adb
@@ -269,7 +269,7 @@ package body GNAT.Sockets.Thin is
function C_Recvmsg
(S : C.int;
Msg : System.Address;
- Flags : C.int) return ssize_t
+ Flags : C.int) return System.CRTL.ssize_t
is
Res : C.int;
Count : C.int := 0;
@@ -287,19 +287,20 @@ package body GNAT.Sockets.Thin is
-- not available in all versions of Windows. So, we use C_Recv instead.
for J in Iovec'Range loop
- Res := C_Recv
- (S,
- Iovec (J).Base.all'Address,
- C.int (Iovec (J).Length),
- Flags);
+ Res :=
+ C_Recv
+ (S,
+ Iovec (J).Base.all'Address,
+ C.int (Iovec (J).Length),
+ Flags);
if Res < 0 then
- return ssize_t (Res);
+ return System.CRTL.ssize_t (Res);
else
Count := Count + Res;
end if;
end loop;
- return ssize_t (Count);
+ return System.CRTL.ssize_t (Count);
end C_Recvmsg;
--------------
@@ -369,10 +370,11 @@ package body GNAT.Sockets.Thin is
-- Check out-of-band data
- Length := C_Recvfrom
- (S, Buffer'Address, 1, Flag,
- From => System.Null_Address,
- Fromlen => Fromlen'Unchecked_Access);
+ Length :=
+ C_Recvfrom
+ (S, Buffer'Address, 1, Flag,
+ From => System.Null_Address,
+ Fromlen => Fromlen'Unchecked_Access);
-- Is Fromlen necessary if From is Null_Address???
-- If the signal is not an out-of-band data, then it
@@ -404,7 +406,7 @@ package body GNAT.Sockets.Thin is
function C_Sendmsg
(S : C.int;
Msg : System.Address;
- Flags : C.int) return ssize_t
+ Flags : C.int) return System.CRTL.ssize_t
is
Res : C.int;
Count : C.int := 0;
@@ -423,21 +425,23 @@ package body GNAT.Sockets.Thin is
-- instead.
for J in Iovec'Range loop
- Res := C_Sendto
- (S,
- Iovec (J).Base.all'Address,
- C.int (Iovec (J).Length),
- Flags => Flags,
- To => MH.Msg_Name,
- Tolen => C.int (MH.Msg_Namelen));
+ Res :=
+ C_Sendto
+ (S,
+ Iovec (J).Base.all'Address,
+ C.int (Iovec (J).Length),
+ Flags => Flags,
+ To => MH.Msg_Name,
+ Tolen => C.int (MH.Msg_Namelen));
if Res < 0 then
- return ssize_t (Res);
+ return System.CRTL.ssize_t (Res);
else
Count := Count + Res;
end if;
end loop;
- return ssize_t (Count);
+
+ return System.CRTL.ssize_t (Count);
end C_Sendmsg;
--------------