diff options
author | Andy Wingo <wingo@pobox.com> | 2014-02-08 14:55:16 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2014-02-08 14:55:16 +0100 |
commit | c8b7b0dad33d6221682c5f49b7635d8de7e15bab (patch) | |
tree | 59c99482d075258a6a80e63c1c8bede574c3eabb /libguile/socket.c | |
parent | 12b8487d5d7272ae5bda62477df60d3e795aa645 (diff) | |
parent | b9b88351ea2c4b43a6f90938554dc5693b17e328 (diff) | |
download | guile-c8b7b0dad33d6221682c5f49b7635d8de7e15bab.tar.gz |
Merge commit 'b9b88351ea2c4b43a6f90938554dc5693b17e328'
Conflicts:
libguile/deprecated.h
test-suite/tests/00-socket.test
Diffstat (limited to 'libguile/socket.c')
-rw-r--r-- | libguile/socket.c | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/libguile/socket.c b/libguile/socket.c index 8c1326a54..0516e5267 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -1,5 +1,5 @@ /* Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, - * 2006, 2007, 2009, 2011, 2012, 2013 Free Software Foundation, Inc. + * 2006, 2007, 2009, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -92,50 +92,6 @@ typedef union -SCM_DEFINE (scm_htons, "htons", 1, 0, 0, - (SCM value), - "Convert a 16 bit quantity from host to network byte ordering.\n" - "@var{value} is packed into 2 bytes, which are then converted\n" - "and returned as a new integer.") -#define FUNC_NAME s_scm_htons -{ - return scm_from_ushort (htons (scm_to_ushort (value))); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_ntohs, "ntohs", 1, 0, 0, - (SCM value), - "Convert a 16 bit quantity from network to host byte ordering.\n" - "@var{value} is packed into 2 bytes, which are then converted\n" - "and returned as a new integer.") -#define FUNC_NAME s_scm_ntohs -{ - return scm_from_ushort (ntohs (scm_to_ushort (value))); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_htonl, "htonl", 1, 0, 0, - (SCM value), - "Convert a 32 bit quantity from host to network byte ordering.\n" - "@var{value} is packed into 4 bytes, which are then converted\n" - "and returned as a new integer.") -#define FUNC_NAME s_scm_htonl -{ - return scm_from_ulong (htonl (scm_to_uint32 (value))); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_ntohl, "ntohl", 1, 0, 0, - (SCM value), - "Convert a 32 bit quantity from network to host byte ordering.\n" - "@var{value} is packed into 4 bytes, which are then converted\n" - "and returned as a new integer.") -#define FUNC_NAME s_scm_ntohl -{ - return scm_from_ulong (ntohl (scm_to_uint32 (value))); -} -#undef FUNC_NAME - #ifdef HAVE_INET_NETOF SCM_DEFINE (scm_inet_netof, "inet-netof", 1, 0, 0, (SCM address), |