projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regex: port to Stratus OpenVOS
[gnulib.git]
/
lib
/
arpa_inet.in.h
diff --git
a/lib/arpa_inet.in.h
b/lib/arpa_inet.in.h
index
fbf0842
..
b042d6d
100644
(file)
--- a/
lib/arpa_inet.in.h
+++ b/
lib/arpa_inet.in.h
@@
-1,6
+1,6
@@
/* A GNU-like <arpa/inet.h>.
/* A GNU-like <arpa/inet.h>.
- Copyright (C) 2005-2006, 2008-201
0
Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2008-201
1
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
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,7
@@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifndef _
GL
_ARPA_INET_H
+#ifndef _
@GUARD_PREFIX@
_ARPA_INET_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@@
-27,13
+27,19
@@
# include <features.h> /* for __GLIBC__ */
#endif
# include <features.h> /* for __GLIBC__ */
#endif
-/* Gnulib's sys/socket.h is responsible for
pulling in winsock2.h etc
- under MinGW.
+/* Gnulib's sys/socket.h is responsible for
defining socklen_t (used below) and
+
for pulling in winsock2.h etc.
under MinGW.
But avoid namespace pollution on glibc systems. */
#ifndef __GLIBC__
# include <sys/socket.h>
#endif
But avoid namespace pollution on glibc systems. */
#ifndef __GLIBC__
# include <sys/socket.h>
#endif
+/* On NonStop Kernel, inet_ntop and inet_pton are declared in <netdb.h>.
+ But avoid namespace pollution on glibc systems. */
+#if defined __TANDEM && !defined __GLIBC__
+# include <netdb.h>
+#endif
+
#if @HAVE_ARPA_INET_H@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_ARPA_INET_H@
/* The include_next requires a split double-inclusion guard. */
@@
-41,16
+47,15
@@
#endif
#endif
-#ifndef _GL_ARPA_INET_H
-#define _GL_ARPA_INET_H
+#ifndef _@GUARD_PREFIX@_ARPA_INET_H
+#define _@GUARD_PREFIX@_ARPA_INET_H
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definition of _GL_ARG_NONNULL is copied here. */
/* The definition of _GL_WARN_ON_USE is copied here. */
/* The definition of _GL_ARG_NONNULL is copied here. */
/* The definition of _GL_WARN_ON_USE is copied here. */
-#ifdef __cplusplus
-extern "C" {
-#endif
#if @GNULIB_INET_NTOP@
# if !@HAVE_DECL_INET_NTOP@
#if @GNULIB_INET_NTOP@
# if !@HAVE_DECL_INET_NTOP@
@@
-69,10
+74,17
@@
extern "C" {
For more details, see the POSIX:2001 specification
<http://www.opengroup.org/susv3xsh/inet_ntop.html>. */
For more details, see the POSIX:2001 specification
<http://www.opengroup.org/susv3xsh/inet_ntop.html>. */
-extern const char *inet_ntop (int af, const void *restrict src,
- char *restrict dst, socklen_t cnt)
- _GL_ARG_NONNULL ((2, 3));
+_GL_FUNCDECL_SYS (inet_ntop, const char *,
+ (int af, const void *restrict src,
+ char *restrict dst, socklen_t cnt)
+ _GL_ARG_NONNULL ((2, 3)));
# endif
# endif
+/* Need to cast, because on NonStop Kernel, the fourth parameter is
+ size_t cnt. */
+_GL_CXXALIAS_SYS_CAST (inet_ntop, const char *,
+ (int af, const void *restrict src,
+ char *restrict dst, socklen_t cnt));
+_GL_CXXALIASWARN (inet_ntop);
#elif defined GNULIB_POSIXCHECK
# undef inet_ntop
# if HAVE_RAW_DECL_INET_NTOP
#elif defined GNULIB_POSIXCHECK
# undef inet_ntop
# if HAVE_RAW_DECL_INET_NTOP
@@
-83,9
+95,13
@@
_GL_WARN_ON_USE (inet_ntop, "inet_ntop is unportable - "
#if @GNULIB_INET_PTON@
# if !@HAVE_DECL_INET_PTON@
#if @GNULIB_INET_PTON@
# if !@HAVE_DECL_INET_PTON@
-extern int inet_pton (int af, const char *restrict src, void *restrict dst)
- _GL_ARG_NONNULL ((2, 3));
+_GL_FUNCDECL_SYS (inet_pton, int,
+ (int af, const char *restrict src, void *restrict dst)
+ _GL_ARG_NONNULL ((2, 3)));
# endif
# endif
+_GL_CXXALIAS_SYS (inet_pton, int,
+ (int af, const char *restrict src, void *restrict dst));
+_GL_CXXALIASWARN (inet_pton);
#elif defined GNULIB_POSIXCHECK
# undef inet_pton
# if HAVE_RAW_DECL_INET_PTON
#elif defined GNULIB_POSIXCHECK
# undef inet_pton
# if HAVE_RAW_DECL_INET_PTON
@@
-94,9
+110,6
@@
_GL_WARN_ON_USE (inet_pton, "inet_pton is unportable - "
# endif
#endif
# endif
#endif
-#ifdef __cplusplus
-}
-#endif
-#endif /* _
GL
_ARPA_INET_H */
-#endif /* _
GL
_ARPA_INET_H */
+#endif /* _
@GUARD_PREFIX@
_ARPA_INET_H */
+#endif /* _
@GUARD_PREFIX@
_ARPA_INET_H */