Backout previous. trunk
authortsutsui <tsutsui@NetBSD.org>
Wed, 20 Jan 2010 19:54:07 +0000
branchtrunk
changeset 187324 6777dfddb23c
parent 187323 ff0eda823e9c
child 187325 3865bd7585cd
Backout previous.
crypto/dist/heimdal/lib/asn1/gen_locl.h
crypto/dist/heimdal/lib/asn1/lex.h
crypto/dist/heimdal/lib/com_err/compile_et.c
crypto/dist/heimdal/lib/com_err/compile_et.h
crypto/dist/heimdal/lib/roken/strlcat.c
crypto/dist/heimdal/lib/roken/strlcpy.c
crypto/dist/heimdal/lib/roken/strupr.c
crypto/dist/heimdal/lib/roken/warnerr.c
crypto/dist/heimdal/lib/vers/print_version.c
--- a/crypto/dist/heimdal/lib/asn1/gen_locl.h	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_locl.h	Wed Jan 20 19:54:07 2010 +0000
@@ -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"
--- a/crypto/dist/heimdal/lib/asn1/lex.h	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/asn1/lex.h	Wed Jan 20 19:54:07 2010 +0000
@@ -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)));
--- a/crypto/dist/heimdal/lib/com_err/compile_et.c	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/com_err/compile_et.c	Wed Jan 20 19:54:07 2010 +0000
@@ -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"
 
--- a/crypto/dist/heimdal/lib/com_err/compile_et.h	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/com_err/compile_et.h	Wed Jan 20 19:54:07 2010 +0000
@@ -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;
--- a/crypto/dist/heimdal/lib/roken/strlcat.c	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/strlcat.c	Wed Jan 20 19:54:07 2010 +0000
@@ -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
 
--- a/crypto/dist/heimdal/lib/roken/strlcpy.c	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/strlcpy.c	Wed Jan 20 19:54:07 2010 +0000
@@ -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
 
--- a/crypto/dist/heimdal/lib/roken/strupr.c	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/strupr.c	Wed Jan 20 19:54:07 2010 +0000
@@ -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
--- a/crypto/dist/heimdal/lib/roken/warnerr.c	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/warnerr.c	Wed Jan 20 19:54:07 2010 +0000
@@ -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
--- a/crypto/dist/heimdal/lib/vers/print_version.c	Wed Jan 20 19:02:42 2010 +0000
+++ b/crypto/dist/heimdal/lib/vers/print_version.c	Wed Jan 20 19:54:07 2010 +0000
@@ -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"