Updated

[bpt/guile.git] / libguile / socket.h

diff --git a/libguile/socket.h b/libguile/socket.h
index 8656b2a..70bcaeb 100644 (file)
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -2,7 +2,7 @@
 
 #ifndef SOCKETH
 #define SOCKETH
-/*     Copyright (C) 1995 Free Software Foundation, Inc.
+/*     Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -40,80 +41,32 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 
-#include <libguile/__scm.h>
+#include "libguile/__scm.h"
 
 \f
 
 
-\f
-#ifdef __STDC__
-extern SCM scm_sys_inet_aton (SCM address);
-extern SCM scm_inet_ntoa (SCM inetid);
-extern SCM scm_inet_netof (SCM address);
-extern SCM scm_lnaof (SCM address);
-extern SCM scm_inet_makeaddr (SCM net, SCM lna);
-extern SCM scm_sys_getnet (SCM name);
-extern SCM scm_sys_getproto (SCM name);
-extern SCM scm_sys_getserv (SCM name, SCM proto);
-extern SCM scm_sethost (SCM arg);
-extern SCM scm_setnet (SCM arg);
-extern SCM scm_setproto (SCM arg);
-extern SCM scm_setserv (SCM arg);
-extern SCM scm_sys_socket (SCM family, SCM style, SCM proto);
-extern SCM scm_sys_socketpair (SCM family, SCM style, SCM proto);
-
-extern SCM scm_sys_getsockopt (SCM port, SCM level, SCM optname);
-extern SCM scm_sys_setsockopt (SCM port, SCM level, SCM optname, SCM value);
-extern SCM scm_sys_shutdown (SCM port, SCM how);
-extern SCM scm_sys_connect (SCM sockpt, SCM fam, SCM address, SCM args);
-extern SCM scm_sys_bind (SCM sockpt, SCM fam, SCM address);
-extern SCM scm_sys_listen (SCM port, SCM backlog);
-extern void scm_init_addr_buffer (void);
-extern SCM scm_sys_accept (SCM sockpt);
-extern SCM scm_sys_getsockname (SCM sockpt);
-extern SCM scm_sys_getpeername (SCM sockpt);
-extern SCM scm_sys_recv (SCM sockpt, SCM buff_or_size, SCM flags);
-extern SCM scm_sys_send (SCM sockpt, SCM message, SCM flags);
-extern SCM scm_sys_recvfrom (SCM sockpt, SCM buff_or_size, SCM flags);
-extern SCM scm_sys_sendto (SCM sockpt, SCM message, SCM fam, SCM address, SCM args_and_flags);
-extern void scm_init_socket (void);
 
-#else /* STDC */
-extern SCM scm_sys_inet_aton ();
-extern SCM scm_inet_ntoa ();
-extern SCM scm_inet_netof ();
-extern SCM scm_lnaof ();
-extern SCM scm_inet_makeaddr ();
-extern SCM scm_sys_getnet ();
-extern SCM scm_sys_getproto ();
-extern SCM scm_sys_getserv ();
-extern SCM scm_sethost ();
-extern SCM scm_setnet ();
-extern SCM scm_setproto ();
-extern SCM scm_setserv ();
-extern SCM scm_sys_socket ();
-extern SCM scm_sys_socketpair ();
-extern SCM scm_sys_getsockopt ();
-extern SCM scm_sys_setsockopt ();
-extern SCM scm_sys_shutdown ();
-extern SCM scm_sys_connect ();
-extern SCM scm_sys_bind ();
-extern SCM scm_sys_listen ();
-extern void scm_init_addr_buffer ();
-extern SCM scm_sys_accept ();
-extern SCM scm_sys_getsockname ();
-extern SCM scm_sys_getpeername ();
-extern SCM scm_sys_recv ();
-extern SCM scm_sys_send ();
-extern SCM scm_sys_recvfrom ();
-extern SCM scm_sys_sendto ();
-extern void scm_init_socket ();
-
-#endif /* STDC */
+\f
 
+extern SCM scm_socket SCM_P ((SCM family, SCM style, SCM proto));
+extern SCM scm_socketpair SCM_P ((SCM family, SCM style, SCM proto));
+extern SCM scm_getsockopt SCM_P ((SCM sfd, SCM level, SCM optname));
+extern SCM scm_setsockopt SCM_P ((SCM sfd, SCM level, SCM optname, SCM value));
+extern SCM scm_shutdown SCM_P ((SCM sfd, SCM how));
+extern SCM scm_connect SCM_P ((SCM sockfd, SCM fam, SCM address, SCM args));
+extern SCM scm_bind SCM_P ((SCM sockfd, SCM fam, SCM address, SCM args));
+extern SCM scm_listen SCM_P ((SCM sfd, SCM backlog));
+extern SCM scm_accept SCM_P ((SCM sockfd));
+extern SCM scm_getsockname SCM_P ((SCM sockfd));
+extern SCM scm_getpeername SCM_P ((SCM sockfd));
+extern SCM scm_recv SCM_P ((SCM sockfd, SCM buff_or_size, SCM flags));
+extern SCM scm_send SCM_P ((SCM sockfd, SCM message, SCM flags));
+extern SCM scm_recvfrom SCM_P ((SCM sockfd, SCM buff_or_size, SCM flags, SCM offset, SCM length));
+extern SCM scm_sendto SCM_P ((SCM sockfd, SCM message, SCM fam, SCM address, SCM args_and_flags));
+extern void scm_init_socket SCM_P ((void));
 
 #endif  /* SOCKETH */