This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Ada] pending clean ups


Tested on x86-linux, committed on mainline.

Add a missing copyright update in previous change to mingw32.h
Add missed clean up in g-socthi-*.ads (dead code removal).

        * g-socthi-mingw.ads, g-socthi-vms.ads: Remove C_Read and C_Write from
        internal implementation unit GNAT.Sockets.Thin,
        as their usage for sockets is non-portable (using the read and write
        functions from the system runtime library is fine on UNIX but won't
        work under Windows).

        * mingw32.h: Update copyright notice.
--
Index: mingw32.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/mingw32.h,v
retrieving revision 1.2
diff -u -p -r1.2 mingw32.h
--- mingw32.h	20 Oct 2004 08:05:09 -0000	1.2
+++ mingw32.h	25 Nov 2004 16:13:35 -0000
@@ -6,7 +6,7 @@
  *                                                                          *
  *                              C Header File                               *
  *                                                                          *
- *            Copyright (C) 2002, Free Software Foundation, Inc.            *
+ *          Copyright (C) 2002-2004, Free Software Foundation, Inc.         *
  *                                                                          *
  * 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- *
Index: g-socthi-mingw.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-socthi-mingw.ads,v
retrieving revision 1.2
diff -u -p -r1.2 g-socthi-mingw.ads
--- g-socthi-mingw.ads	9 Aug 2004 12:24:10 -0000	1.2
+++ g-socthi-mingw.ads	25 Nov 2004 16:13:35 -0000
@@ -262,11 +262,6 @@ package GNAT.Sockets.Thin is
      (S       : C.int;
       Backlog : C.int) return C.int;
 
-   function C_Read
-     (Fildes : C.int;
-      Buf    : System.Address;
-      Nbyte  : C.int) return C.int;
-
    function C_Readv
      (Socket : C.int;
       Iov    : System.Address;
@@ -329,11 +324,6 @@ package GNAT.Sockets.Thin is
    function C_System
      (Command : System.Address) return C.int;
 
-   function C_Write
-     (Fildes : C.int;
-      Buf    : System.Address;
-      Nbyte  : C.int) return C.int;
-
    function C_Writev
      (Socket : C.int;
       Iov    : System.Address;
@@ -408,7 +398,6 @@ private
    pragma Import (Stdcall, C_Inet_Addr, "inet_addr");
    pragma Import (Stdcall, C_Ioctl, "ioctlsocket");
    pragma Import (Stdcall, C_Listen, "listen");
-   pragma Import (C, C_Read, "_read");
    pragma Import (Stdcall, C_Recv, "recv");
    pragma Import (Stdcall, C_Recvfrom, "recvfrom");
    pragma Import (Stdcall, C_Send, "send");
@@ -418,7 +407,6 @@ private
    pragma Import (Stdcall, C_Socket, "socket");
    pragma Import (C, C_Strerror, "strerror");
    pragma Import (C, C_System, "_system");
-   pragma Import (C, C_Write, "_write");
    pragma Import (Stdcall, Socket_Errno, "WSAGetLastError");
    pragma Import (Stdcall, Set_Socket_Errno, "WSASetLastError");
    pragma Import (Stdcall, WSAStartup, "WSAStartup");
Index: g-socthi-vms.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-socthi-vms.ads,v
retrieving revision 1.2
diff -u -p -r1.2 g-socthi-vms.ads
--- g-socthi-vms.ads	9 Aug 2004 12:24:10 -0000	1.2
+++ g-socthi-vms.ads	25 Nov 2004 16:13:35 -0000
@@ -273,12 +273,6 @@ package GNAT.Sockets.Thin is
 
    function C_Listen (S, Backlog : C.int) return C.int;
 
-   function C_Read
-     (Fd    : C.int;
-      Buf   : System.Address;
-      Count : C.int)
-      return  C.int;
-
    function C_Readv
      (Fd     : C.int;
       Iov    : System.Address;
@@ -352,12 +346,6 @@ package GNAT.Sockets.Thin is
      (Command : System.Address)
       return    C.int;
 
-   function C_Write
-     (Fd    : C.int;
-      Buf   : System.Address;
-      Count : C.int)
-      return  C.int;
-
    function C_Writev
      (Fd     : C.int;
       Iov    : System.Address;
@@ -427,13 +415,11 @@ private
    pragma Import (C, C_Getsockopt,    "DECC$GETSOCKOPT");
    pragma Import (C, C_Inet_Addr,     "DECC$INET_ADDR");
    pragma Import (C, C_Listen,        "DECC$LISTEN");
-   pragma Import (C, C_Read,          "DECC$READ");
    pragma Import (C, C_Select,        "DECC$SELECT");
    pragma Import (C, C_Setsockopt,    "DECC$SETSOCKOPT");
    pragma Import (C, C_Shutdown,      "DECC$SHUTDOWN");
    pragma Import (C, C_Strerror,      "DECC$STRERROR");
    pragma Import (C, C_System,        "DECC$SYSTEM");
-   pragma Import (C, C_Write,         "DECC$WRITE");
 
    pragma Import (C, Free_Socket_Set, "__gnat_free_socket_set");
    pragma Import (C, Get_Socket_From_Set, "__gnat_get_socket_from_set");


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]