summaryrefslogtreecommitdiff
path: root/sysdeps/generic/bits
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/generic/bits')
-rw-r--r--sysdeps/generic/bits/socket.h5
-rw-r--r--sysdeps/generic/bits/utmpx.h34
2 files changed, 5 insertions, 34 deletions
diff --git a/sysdeps/generic/bits/socket.h b/sysdeps/generic/bits/socket.h
index 5dc1e65370..01844bc143 100644
--- a/sysdeps/generic/bits/socket.h
+++ b/sysdeps/generic/bits/socket.h
@@ -17,6 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#ifndef __BITS_SOCKET_H
+#define __BITS_SOCKET_H 1
+
#if !defined _SYS_SOCKET_H && !defined _NETINET_IN_H
# error "Never include <bits/socket.h> directly; use <sys/socket.h> instead."
#endif
@@ -196,3 +199,5 @@ struct linger
int l_onoff; /* Nonzero to linger on close. */
int l_linger; /* Time to linger. */
};
+
+#endif /* bits/socket.h */
diff --git a/sysdeps/generic/bits/utmpx.h b/sysdeps/generic/bits/utmpx.h
deleted file mode 100644
index e22660f6d6..0000000000
--- a/sysdeps/generic/bits/utmpx.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Structures and definitions for the user accounting database. Generic/BSDish
- Copyright (C) 1993, 1996, 1997 Free Software Foundation, Inc.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifndef _UTMPX_H
-# error "Never include <bits/utmpx.h> directly; use <utmpx.h> instead."
-#endif
-
-
-#define __UT_NAMESIZE 8
-#define __UT_LINESIZE 8
-#define __UT_HOSTSIZE 16
-
-struct utmpx
- {
- char ut_line[__UT_LINESIZE];
- char ut_name[__UT_NAMESIZE];
- char ut_host[__UT_HOSTSIZE];
- long int ut_time;
- };