projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strtoumax: fix typo in previous commit.
[gnulib.git]
/
lib
/
sys_ioctl.in.h
diff --git
a/lib/sys_ioctl.in.h
b/lib/sys_ioctl.in.h
index
511d2c5
..
ea0796a
100644
(file)
--- a/
lib/sys_ioctl.in.h
+++ b/
lib/sys_ioctl.in.h
@@
-1,5
+1,5
@@
/* Substitute for and wrapper around <sys/ioctl.h>.
/* Substitute for and wrapper around <sys/ioctl.h>.
- Copyright (C) 2008-201
0
Free Software Foundation, Inc.
+ Copyright (C) 2008-201
3
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
@@
-12,22
+12,22
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
-#ifndef _
GL
_SYS_IOCTL_H
+#ifndef _
@GUARD_PREFIX@
_SYS_IOCTL_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+@PRAGMA_COLUMNS@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SYS_IOCTL_H@
# @INCLUDE_NEXT@ @NEXT_SYS_IOCTL_H@
#endif
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SYS_IOCTL_H@
# @INCLUDE_NEXT@ @NEXT_SYS_IOCTL_H@
#endif
-#ifndef _
GL
_SYS_IOCTL_H
-#define _
GL
_SYS_IOCTL_H
+#ifndef _
@GUARD_PREFIX@
_SYS_IOCTL_H
+#define _
@GUARD_PREFIX@
_SYS_IOCTL_H
/* AIX 5.1 and Solaris 10 declare ioctl() in <unistd.h> and in <stropts.h>,
but not in <sys/ioctl.h>.
/* AIX 5.1 and Solaris 10 declare ioctl() in <unistd.h> and in <stropts.h>,
but not in <sys/ioctl.h>.
@@
-44,18
+44,23
@@
/* Declare overridden functions. */
#if @GNULIB_IOCTL@
/* Declare overridden functions. */
#if @GNULIB_IOCTL@
-# if @
SYS_IOCTL_H_HAVE_WINSOCK2_H
@
+# if @
REPLACE_IOCTL
@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef ioctl
# define ioctl rpl_ioctl
# endif
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef ioctl
# define ioctl rpl_ioctl
# endif
+_GL_FUNCDECL_RPL (ioctl, int,
+ (int fd, int request, ... /* {void *,char *} arg */));
+_GL_CXXALIAS_RPL (ioctl, int,
+ (int fd, int request, ... /* {void *,char *} arg */));
+# else
+# if @SYS_IOCTL_H_HAVE_WINSOCK2_H@ || 1
_GL_FUNCDECL_SYS (ioctl, int,
(int fd, int request, ... /* {void *,char *} arg */));
_GL_FUNCDECL_SYS (ioctl, int,
(int fd, int request, ... /* {void *,char *} arg */));
+# endif
+_GL_CXXALIAS_SYS (ioctl, int,
+ (int fd, int request, ... /* {void *,char *} arg */));
# endif
# endif
-/* Need to cast, because on glibc systems, the second parameter is
- unsigned long int request. */
-_GL_CXXALIAS_SYS_CAST (ioctl, int,
- (int fd, int request, ... /* {void *,char *} arg */));
_GL_CXXALIASWARN (ioctl);
#elif @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
# undef ioctl
_GL_CXXALIASWARN (ioctl);
#elif @SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
# undef ioctl
@@
-69,5
+74,5
@@
_GL_WARN_ON_USE (ioctl, "ioctl does not portably work on sockets - "
#endif
#endif
-#endif /* _
GL
_SYS_IOCTL_H */
-#endif /* _
GL
_SYS_IOCTL_H */
+#endif /* _
@GUARD_PREFIX@
_SYS_IOCTL_H */
+#endif /* _
@GUARD_PREFIX@
_SYS_IOCTL_H */