Module Name: src
Committed By: tsutsui
Date: Wed Jan 20 19:54:07 UTC 2010
Modified Files:
src/crypto/dist/heimdal/lib/asn1: gen_locl.h lex.h
src/crypto/dist/heimdal/lib/com_err: compile_et.c compile_et.h
src/crypto/dist/heimdal/lib/roken: strlcat.c strlcpy.c strupr.c
warnerr.c
src/crypto/dist/heimdal/lib/vers: print_version.c
Log Message:
Backout previous.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/dist/heimdal/lib/asn1/gen_locl.h \
src/crypto/dist/heimdal/lib/asn1/lex.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/dist/heimdal/lib/com_err/compile_et.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/dist/heimdal/lib/com_err/compile_et.h
cvs rdiff -u -r1.6 -r1.7 src/crypto/dist/heimdal/lib/roken/strlcat.c \
src/crypto/dist/heimdal/lib/roken/strlcpy.c \
src/crypto/dist/heimdal/lib/roken/strupr.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/dist/heimdal/lib/roken/warnerr.c
cvs rdiff -u -r1.9 -r1.10 src/crypto/dist/heimdal/lib/vers/print_version.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/heimdal/lib/asn1/gen_locl.h
diff -u src/crypto/dist/heimdal/lib/asn1/gen_locl.h:1.3 src/crypto/dist/heimdal/lib/asn1/gen_locl.h:1.4
--- src/crypto/dist/heimdal/lib/asn1/gen_locl.h:1.3 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/asn1/gen_locl.h Wed Jan 20 19:54:07 2010
@@ -32,7 +32,7 @@
*/
/* $Heimdal: gen_locl.h 18008 2006-09-05 12:29:18Z lha $
- $NetBSD: gen_locl.h,v 1.3 2010/01/20 12:54:17 tsutsui Exp $ */
+ $NetBSD: gen_locl.h,v 1.4 2010/01/20 19:54:07 tsutsui Exp $ */
#ifndef __GEN_LOCL_H__
#define __GEN_LOCL_H__
@@ -49,11 +49,7 @@
#include <time.h>
#include <errno.h>
#include <err.h>
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include <roken-common.h>
-#else
#include <roken.h>
-#endif
#include "hash.h"
#include "symbol.h"
#include "asn1-common.h"
Index: src/crypto/dist/heimdal/lib/asn1/lex.h
diff -u src/crypto/dist/heimdal/lib/asn1/lex.h:1.3 src/crypto/dist/heimdal/lib/asn1/lex.h:1.4
--- src/crypto/dist/heimdal/lib/asn1/lex.h:1.3 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/asn1/lex.h Wed Jan 20 19:54:07 2010
@@ -32,14 +32,9 @@
*/
/* $Heimdal: lex.h 15617 2005-07-12 06:27:42Z lha $
- $NetBSD: lex.h,v 1.3 2010/01/20 12:54:17 tsutsui Exp $ */
+ $NetBSD: lex.h,v 1.4 2010/01/20 19:54:07 tsutsui Exp $ */
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#include <roken-common.h>
-#else
#include <roken.h>
-#endif
void error_message (const char *, ...)
__attribute__ ((format (printf, 1, 2)));
Index: src/crypto/dist/heimdal/lib/com_err/compile_et.c
diff -u src/crypto/dist/heimdal/lib/com_err/compile_et.c:1.7 src/crypto/dist/heimdal/lib/com_err/compile_et.c:1.8
--- src/crypto/dist/heimdal/lib/com_err/compile_et.c:1.7 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/com_err/compile_et.c Wed Jan 20 19:54:07 2010
@@ -36,8 +36,9 @@
#include <getarg.h>
__RCSID("$Heimdal: compile_et.c 15426 2005-06-16 19:21:42Z lha $"
- "$NetBSD: compile_et.c,v 1.7 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: compile_et.c,v 1.8 2010/01/20 19:54:07 tsutsui Exp $");
+#include <roken.h>
#include <err.h>
#include "parse.h"
Index: src/crypto/dist/heimdal/lib/com_err/compile_et.h
diff -u src/crypto/dist/heimdal/lib/com_err/compile_et.h:1.3 src/crypto/dist/heimdal/lib/com_err/compile_et.h:1.4
--- src/crypto/dist/heimdal/lib/com_err/compile_et.h:1.3 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/com_err/compile_et.h Wed Jan 20 19:54:07 2010
@@ -32,7 +32,7 @@
*/
/* $Heimdal: compile_et.h 15426 2005-06-16 19:21:42Z lha $
- $NetBSD: compile_et.h,v 1.3 2010/01/20 12:54:17 tsutsui Exp $ */
+ $NetBSD: compile_et.h,v 1.4 2010/01/20 19:54:07 tsutsui Exp $ */
#ifndef __COMPILE_ET_H__
#define __COMPILE_ET_H__
@@ -47,11 +47,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <ctype.h>
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include <roken-common.h>
-#else
#include <roken.h>
-#endif
extern long base_id;
extern int number;
Index: src/crypto/dist/heimdal/lib/roken/strlcat.c
diff -u src/crypto/dist/heimdal/lib/roken/strlcat.c:1.6 src/crypto/dist/heimdal/lib/roken/strlcat.c:1.7
--- src/crypto/dist/heimdal/lib/roken/strlcat.c:1.6 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/roken/strlcat.c Wed Jan 20 19:54:07 2010
@@ -34,14 +34,10 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "roken-common.h"
-#else
#include "roken.h"
-#endif
__RCSID("$Heimdal: strlcat.c 14773 2005-04-12 11:29:18Z lha $"
- "$NetBSD: strlcat.c,v 1.6 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: strlcat.c,v 1.7 2010/01/20 19:54:07 tsutsui Exp $");
#ifndef HAVE_STRLCAT
Index: src/crypto/dist/heimdal/lib/roken/strlcpy.c
diff -u src/crypto/dist/heimdal/lib/roken/strlcpy.c:1.6 src/crypto/dist/heimdal/lib/roken/strlcpy.c:1.7
--- src/crypto/dist/heimdal/lib/roken/strlcpy.c:1.6 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/roken/strlcpy.c Wed Jan 20 19:54:07 2010
@@ -34,14 +34,10 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "roken-common.h"
-#else
#include "roken.h"
-#endif
__RCSID("$Heimdal: strlcpy.c 14773 2005-04-12 11:29:18Z lha $"
- "$NetBSD: strlcpy.c,v 1.6 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: strlcpy.c,v 1.7 2010/01/20 19:54:07 tsutsui Exp $");
#ifndef HAVE_STRLCPY
Index: src/crypto/dist/heimdal/lib/roken/strupr.c
diff -u src/crypto/dist/heimdal/lib/roken/strupr.c:1.6 src/crypto/dist/heimdal/lib/roken/strupr.c:1.7
--- src/crypto/dist/heimdal/lib/roken/strupr.c:1.6 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/roken/strupr.c Wed Jan 20 19:54:07 2010
@@ -34,17 +34,12 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
__RCSID("$Heimdal: strupr.c 21005 2007-06-08 01:54:35Z lha $"
- "$NetBSD: strupr.c,v 1.6 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: strupr.c,v 1.7 2010/01/20 19:54:07 tsutsui Exp $");
#endif
#include <string.h>
#include <ctype.h>
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#include "roken-common.h"
-#else
#include "roken.h"
-#endif
#ifndef HAVE_STRUPR
char * ROKEN_LIB_FUNCTION
Index: src/crypto/dist/heimdal/lib/roken/warnerr.c
diff -u src/crypto/dist/heimdal/lib/roken/warnerr.c:1.4 src/crypto/dist/heimdal/lib/roken/warnerr.c:1.5
--- src/crypto/dist/heimdal/lib/roken/warnerr.c:1.4 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/roken/warnerr.c Wed Jan 20 19:54:07 2010
@@ -34,16 +34,10 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
__RCSID("$Heimdal: warnerr.c 14773 2005-04-12 11:29:18Z lha $"
- "$NetBSD: warnerr.c,v 1.4 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: warnerr.c,v 1.5 2010/01/20 19:54:07 tsutsui Exp $");
#endif
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#include "roken-common.h"
-#else
#include "roken.h"
-#endif
-
#include "err.h"
void ROKEN_LIB_FUNCTION
Index: src/crypto/dist/heimdal/lib/vers/print_version.c
diff -u src/crypto/dist/heimdal/lib/vers/print_version.c:1.9 src/crypto/dist/heimdal/lib/vers/print_version.c:1.10
--- src/crypto/dist/heimdal/lib/vers/print_version.c:1.9 Wed Jan 20 12:54:17 2010
+++ src/crypto/dist/heimdal/lib/vers/print_version.c Wed Jan 20 19:54:07 2010
@@ -34,15 +34,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
__RCSID("$Heimdal: print_version.c 22428 2008-01-13 09:58:05Z lha $"
- "$NetBSD: print_version.c,v 1.9 2010/01/20 12:54:17 tsutsui Exp $");
+ "$NetBSD: print_version.c,v 1.10 2010/01/20 19:54:07 tsutsui Exp $");
#endif
-
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#include "roken-common.h"
-#else
#include "roken.h"
-#endif
#include "print_version.h"
