summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2002-01-31 12:58:36 +0000
committerbde <bde@FreeBSD.org>2002-01-31 12:58:36 +0000
commit6f84f53a9e15e477fb800d6c71805445b5df3f04 (patch)
tree8d8255cfd7b380c8127842c5c581b0db80619b57
parent17c3ef73cc82ff148034bff43775f2993c3f839a (diff)
downloadFreeBSD-src-6f84f53a9e15e477fb800d6c71805445b5df3f04.zip
FreeBSD-src-6f84f53a9e15e477fb800d6c71805445b5df3f04.tar.gz
Fixed world breakage due to missing include of <sys/cdefs.h> in previous
commit. Fixed related style bugs: basename.c: misplaced '#if 0' dirname.c: misplaced '#if 0' getgrent.c: missing '#if 0', and tab lossage in vendor id (the previous commit fixed the complete corruption of the vendor id but lost a tab) getpwent.c: missing '#if 0'
-rw-r--r--lib/libc/gen/basename.c6
-rw-r--r--lib/libc/gen/dirname.c6
-rw-r--r--lib/libc/gen/getgrent.c6
-rw-r--r--lib/libc/gen/getpwent.c4
4 files changed, 17 insertions, 5 deletions
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
index f71627f..ab268cd 100644
--- a/lib/libc/gen/basename.c
+++ b/lib/libc/gen/basename.c
@@ -25,11 +25,13 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
#if 0
+#ifndef lint
static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
-#endif
#endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
index 2ab2086..c46b32e 100644
--- a/lib/libc/gen/dirname.c
+++ b/lib/libc/gen/dirname.c
@@ -25,11 +25,13 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef lint
#if 0
+#ifndef lint
static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
-#endif
#endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 44d708c..ca4b64c 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -33,9 +33,13 @@
* SUCH DAMAGE.
*/
+#if 0
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94";
+static char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94";
#endif /* LIBC_SCCS and not lint */
+#endif
+
+#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 80cd59c..41a9438 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -34,9 +34,13 @@
* SUCH DAMAGE.
*/
+#if 0
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)getpwent.c 8.2 (Berkeley) 4/27/95";
#endif /* LIBC_SCCS and not lint */
+#endif
+
+#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include "un-namespace.h"
OpenPOWER on IntegriCloud