[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/gl
From: |
shishi-commit |
Subject: |
CVS shishi/gl |
Date: |
Thu, 19 Jan 2006 11:36:09 +0100 |
Update of /home/cvs/shishi/gl
In directory dopio:/tmp/cvs-serv697/gl
Modified Files:
Makefile.am gai_strerror.c getaddrinfo.h
Added Files:
socket_.h
Log Message:
Update.
--- /home/cvs/shishi/gl/Makefile.am 2006/01/12 17:17:52 1.73
+++ /home/cvs/shishi/gl/Makefile.am 2006/01/19 10:36:09 1.74
@@ -190,6 +190,24 @@
## end gnulib module strtok_r
+## begin gnulib module sys_socket
+
+BUILT_SOURCES += $(SYS_SOCKET_H)
+EXTRA_DIST += socket_.h
+
+# We need the following in order to create <sys/socket.h> when the system
+# doesn't have one that works with the given compiler.
+sys/socket.h: socket_.h
+ test -d sys || mkdir sys
+ cp $(srcdir)/socket_.h address@hidden
+ mv address@hidden $@
+MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
+
+mostlyclean-local:
+ -rmdir sys 2>/dev/null
+
+## end gnulib module sys_socket
+
## begin gnulib module time_r
libgnu_la_SOURCES += time_r.h
--- /home/cvs/shishi/gl/gai_strerror.c 2005/09/19 16:04:42 1.4
+++ /home/cvs/shishi/gl/gai_strerror.c 2006/01/19 10:36:09 1.5
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
Contributed by Philip Blundell <address@hidden>, 1997.
@@ -25,7 +25,9 @@
#endif
#include <stdio.h>
-#include <netdb.h>
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
#ifdef _LIBC
# include <libintl.h>
@@ -42,7 +44,9 @@
}
values[] =
{
+#ifdef EAI_ADDRFAMILY
{ EAI_ADDRFAMILY, N_("Address family for hostname not supported") },
+#endif
{ EAI_AGAIN, N_("Temporary failure in name resolution") },
{ EAI_BADFLAGS, N_("Bad value for ai_flags") },
{ EAI_FAIL, N_("Non-recoverable failure in name resolution") },
@@ -52,7 +56,9 @@
{ EAI_NONAME, N_("Name or service not known") },
{ EAI_SERVICE, N_("Servname not supported for ai_socktype") },
{ EAI_SOCKTYPE, N_("ai_socktype not supported") },
+#ifdef EAI_ADDRFAMILY
{ EAI_SYSTEM, N_("System error") },
+#endif
#ifdef __USE_GNU
{ EAI_INPROGRESS, N_("Processing request in progress") },
{ EAI_CANCELED, N_("Request canceled") },
--- /home/cvs/shishi/gl/getaddrinfo.h 2005/12/13 17:23:33 1.6
+++ /home/cvs/shishi/gl/getaddrinfo.h 2006/01/19 10:36:09 1.7
@@ -1,5 +1,5 @@
/* Get address information.
- Copyright (C) 1996-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1996-2002, 2003, 2004, 2005, 2006 Free Software Foundation,
Inc.
Contributed by Simon Josefsson <address@hidden>.
This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,9 @@
# include <sys/types.h>
/* Get all getaddrinfo related declarations, if available. */
# include <sys/socket.h>
-# include <netdb.h>
+# ifdef HAVE_NETDB_H
+# include <netdb.h>
+# endif
# ifndef HAVE_STRUCT_ADDRINFO
--- /home/cvs/shishi/gl/socket_.h 2006/01/19 10:36:10 NONE
+++ /home/cvs/shishi/gl/socket_.h 2006/01/19 10:36:10 1.1
/* Provide a sys/socket header file for systems lacking it (read: mingw32).
Copyright (C) 2005, 2006 Free Software Foundation, Inc.
Written by Simon Josefsson.
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
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _SYS_SOCKET_H
#define _SYS_SOCKET_H
/* This file is supposed to be used on platforms that lack
sys/socket.h. It is intended to provide definitions and prototypes
needed by an application.
Currently only mingw32 is supported, which has the header files
winsock2.h and ws2tcpip.h that declare the sys/socket.h definitions
we need. */
#if HAVE_WINSOCK2_H
# include <winsock2.h>
#endif
#if HAVE_WS2TCPIP_H
# include <ws2tcpip.h>
#endif
/* For shutdown(). */
#ifndef SHUT_RD
# define SHUT_RD 0
#endif
#ifndef SHUT_WR
# define SHUT_WR 1
#endif
#ifndef SHUT_RDWR
# define SHUT_RDWR 2
#endif
#endif /* _SYS_SOCKET_H */