projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'snapshot-start' into stable
[gnulib.git]
/
lib
/
sys_utsname.in.h
diff --git
a/lib/sys_utsname.in.h
b/lib/sys_utsname.in.h
index
0e3d7cd
..
a79db81
100644
(file)
--- a/
lib/sys_utsname.in.h
+++ b/
lib/sys_utsname.in.h
@@
-1,5
+1,5
@@
/* Substitute for <sys/utsname.h>.
/* Substitute for <sys/utsname.h>.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009
-2014
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,25
+12,33
@@
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_UTSNAME_H
+#ifndef _
@GUARD_PREFIX@
_SYS_UTSNAME_H
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
+@PRAGMA_COLUMNS@
#if @HAVE_SYS_UTSNAME_H@
#if @HAVE_SYS_UTSNAME_H@
+
+/* Minix 3.1.8 has a bug: <stddef.h> must be included before <sys/utsname.h>.
+ But avoid namespace pollution on glibc systems. */
+# if defined __minix && !defined __GLIBC__
+# include <stddef.h>
+# endif
+
# @INCLUDE_NEXT@ @NEXT_SYS_UTSNAME_H@
# @INCLUDE_NEXT@ @NEXT_SYS_UTSNAME_H@
-#endif
-#
define _GL_SYS_UTSNAME_H
+#
endif
-/* The definition of GL_LINK_WARNING is copied here. */
+#define _@GUARD_PREFIX@_SYS_UTSNAME_H
/* The definition of _GL_ARG_NONNULL 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" {
#ifdef __cplusplus
extern "C" {
@@
-56,6
+64,7
@@
extern "C" {
# define _UTSNAME_MACHINE_LENGTH _UTSNAME_LENGTH
# endif
# define _UTSNAME_MACHINE_LENGTH _UTSNAME_LENGTH
# endif
+# if !GNULIB_defined_struct_utsname
/* Structure describing the system and machine. */
struct utsname
{
/* Structure describing the system and machine. */
struct utsname
{
@@
-72,6
+81,9
@@
struct utsname
/* Name of the hardware type the system is running on. */
char machine[_UTSNAME_MACHINE_LENGTH];
};
/* Name of the hardware type the system is running on. */
char machine[_UTSNAME_MACHINE_LENGTH];
};
+# define GNULIB_defined_struct_utsname 1
+# endif
+
#endif /* !@HAVE_STRUCT_UTSNAME@ */
#endif /* !@HAVE_STRUCT_UTSNAME@ */
@@
-81,10
+93,10
@@
extern int uname (struct utsname *buf) _GL_ARG_NONNULL ((1));
# endif
#elif defined GNULIB_POSIXCHECK
# undef uname
# endif
#elif defined GNULIB_POSIXCHECK
# undef uname
-#
define uname(b) \
- (GL_LINK_WARNING ("uname is unportable - " \
- "use gnulib module uname for portability"), \
- uname (b))
+#
if HAVE_RAW_DECL_UNAME
+_GL_WARN_ON_USE (uname, "uname is unportable - "
+ "use gnulib module uname for portability");
+# endif
#endif
#endif
@@
-93,4
+105,4
@@
extern int uname (struct utsname *buf) _GL_ARG_NONNULL ((1));
#endif
#endif
-#endif /* _
GL
_SYS_UTSNAME_H */
+#endif /* _
@GUARD_PREFIX@
_SYS_UTSNAME_H */