summaryrefslogtreecommitdiff
path: root/lib/getaddrinfo.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-01-30 18:25:07 +0100
committerAndy Wingo <wingo@pobox.com>2012-01-30 18:25:07 +0100
commit855db1905d56efcdf91ae51a9e80990f79030eae (patch)
tree9c918dba899ddae458147ce1095018fcbdec18b0 /lib/getaddrinfo.c
parent91ee7515da0bad91330ce5c87b250d6cf12a2789 (diff)
parent9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a (diff)
downloadguile-855db1905d56efcdf91ae51a9e80990f79030eae.tar.gz
Merge commit '9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a'
Conflicts: libguile/foreign.c module/ice-9/psyntax-pp.scm module/ice-9/psyntax.scm
Diffstat (limited to 'lib/getaddrinfo.c')
-rw-r--r--lib/getaddrinfo.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index 26100313c..8a34edef7 100644
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -1,5 +1,5 @@
/* Get address information (partial implementation).
- Copyright (C) 1997, 2001-2002, 2004-2011 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2001-2002, 2004-2012 Free Software Foundation, Inc.
Contributed by Simon Josefsson <simon@josefsson.org>.
This program is free software; you can redistribute it and/or modify
@@ -56,13 +56,13 @@
#endif
#if defined _WIN32 || defined __WIN32__
-# define WIN32_NATIVE
+# define WINDOWS_NATIVE
#endif
/* gl_sockets_startup */
#include "sockets.h"
-#ifdef WIN32_NATIVE
+#ifdef WINDOWS_NATIVE
typedef int (WSAAPI *getaddrinfo_func) (const char*, const char*,
const struct addrinfo*,
struct addrinfo**);
@@ -153,7 +153,7 @@ getaddrinfo (const char *restrict nodename,
};
#endif
-#ifdef WIN32_NATIVE
+#ifdef WINDOWS_NATIVE
if (use_win32_p ())
return getaddrinfo_ptr (nodename, servname, hints, res);
#endif
@@ -332,11 +332,11 @@ getaddrinfo (const char *restrict nodename,
return 0;
}
-/* Free `addrinfo' structure AI including associated storage. */
+/* Free 'addrinfo' structure AI including associated storage. */
void
freeaddrinfo (struct addrinfo *ai)
{
-#ifdef WIN32_NATIVE
+#ifdef WINDOWS_NATIVE
if (use_win32_p ())
{
freeaddrinfo_ptr (ai);
@@ -362,7 +362,7 @@ getnameinfo (const struct sockaddr *restrict sa, socklen_t salen,
char *restrict service, socklen_t servicelen,
int flags)
{
-#ifdef WIN32_NATIVE
+#ifdef WINDOWS_NATIVE
if (use_win32_p ())
return getnameinfo_ptr (sa, salen, node, nodelen,
service, servicelen, flags);