[src/trunk]: src/crypto/dist/heimdal/lib Don't include src/include heimdal/ro...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72efd870c7bc
branches:  trunk
changeset: 750978:72efd870c7bc
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Jan 20 12:54:17 2010 +0000

description:
Don't include src/include heimdal/roken.h on tools build because
it's "an OS dependent, generated file" configured for the target NetBSD
as noted in itself.  Instead, include <roken-common.h>
(which is included from generated <roken.h> and required
for TRUE and fALSE definitions) and "nbtool_config.h" on tools build.

Fixes PR toolchain/41435 and makes cross build on Cygwin-1.7 work.
No particular comments in the PR.

diffstat:

 crypto/dist/heimdal/lib/asn1/gen_locl.h         |   6 +++++-
 crypto/dist/heimdal/lib/asn1/lex.h              |   7 ++++++-
 crypto/dist/heimdal/lib/com_err/compile_et.c    |   3 +--
 crypto/dist/heimdal/lib/com_err/compile_et.h    |   6 +++++-
 crypto/dist/heimdal/lib/roken/get_window_size.c |   6 +++++-
 crypto/dist/heimdal/lib/roken/getarg.c          |  10 +++++++++-
 crypto/dist/heimdal/lib/roken/strlcat.c         |   6 +++++-
 crypto/dist/heimdal/lib/roken/strlcpy.c         |   6 +++++-
 crypto/dist/heimdal/lib/roken/strupr.c          |   7 ++++++-
 crypto/dist/heimdal/lib/roken/warnerr.c         |   8 +++++++-
 crypto/dist/heimdal/lib/vers/print_version.c    |   8 +++++++-
 11 files changed, 61 insertions(+), 12 deletions(-)

diffs (232 lines):

diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/asn1/gen_locl.h
--- a/crypto/dist/heimdal/lib/asn1/gen_locl.h   Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_locl.h   Wed Jan 20 12:54:17 2010 +0000
@@ -32,7 +32,7 @@
  */
 
 /* $Heimdal: gen_locl.h 18008 2006-09-05 12:29:18Z lha $
-   $NetBSD: gen_locl.h,v 1.2 2008/03/22 08:37:04 mlelstv Exp $ */
+   $NetBSD: gen_locl.h,v 1.3 2010/01/20 12:54:17 tsutsui Exp $ */
 
 #ifndef __GEN_LOCL_H__
 #define __GEN_LOCL_H__
@@ -49,7 +49,11 @@
 #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"
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/asn1/lex.h
--- a/crypto/dist/heimdal/lib/asn1/lex.h        Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/asn1/lex.h        Wed Jan 20 12:54:17 2010 +0000
@@ -32,9 +32,14 @@
  */
 
 /* $Heimdal: lex.h 15617 2005-07-12 06:27:42Z lha $
-   $NetBSD: lex.h,v 1.2 2008/03/22 08:37:04 mlelstv Exp $ */
+   $NetBSD: lex.h,v 1.3 2010/01/20 12:54:17 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)));
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/com_err/compile_et.c
--- a/crypto/dist/heimdal/lib/com_err/compile_et.c      Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/com_err/compile_et.c      Wed Jan 20 12:54:17 2010 +0000
@@ -36,9 +36,8 @@
 #include <getarg.h>
 
 __RCSID("$Heimdal: compile_et.c 15426 2005-06-16 19:21:42Z lha $"
-        "$NetBSD: compile_et.c,v 1.6 2009/02/18 01:18:57 uebayasi Exp $");
+        "$NetBSD: compile_et.c,v 1.7 2010/01/20 12:54:17 tsutsui Exp $");
 
-#include <roken.h>
 #include <err.h>
 #include "parse.h"
 
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/com_err/compile_et.h
--- a/crypto/dist/heimdal/lib/com_err/compile_et.h      Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/com_err/compile_et.h      Wed Jan 20 12:54:17 2010 +0000
@@ -32,7 +32,7 @@
  */
 
 /* $Heimdal: compile_et.h 15426 2005-06-16 19:21:42Z lha $
-   $NetBSD: compile_et.h,v 1.2 2008/03/22 08:37:06 mlelstv Exp $ */
+   $NetBSD: compile_et.h,v 1.3 2010/01/20 12:54:17 tsutsui Exp $ */
 
 #ifndef __COMPILE_ET_H__
 #define __COMPILE_ET_H__
@@ -47,7 +47,11 @@
 #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;
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/roken/get_window_size.c
--- a/crypto/dist/heimdal/lib/roken/get_window_size.c   Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/get_window_size.c   Wed Jan 20 12:54:17 2010 +0000
@@ -34,7 +34,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 __RCSID("$Heimdal: get_window_size.c 21005 2007-06-08 01:54:35Z lha $"
-        "$NetBSD: get_window_size.c,v 1.3 2008/03/22 08:37:21 mlelstv Exp $");
+        "$NetBSD: get_window_size.c,v 1.4 2010/01/20 12:54:17 tsutsui Exp $");
 #endif
 
 #include <stdlib.h>
@@ -59,7 +59,11 @@
 #include <termios.h>
 #endif
 
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "roken-common.h"
+#else
 #include "roken.h"
+#endif
 
 int ROKEN_LIB_FUNCTION
 get_window_size(int fd, struct winsize *wp)
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/roken/getarg.c
--- a/crypto/dist/heimdal/lib/roken/getarg.c    Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/getarg.c    Wed Jan 20 12:54:17 2010 +0000
@@ -34,13 +34,21 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 __RCSID("$Heimdal: getarg.c 21005 2007-06-08 01:54:35Z lha $"
-        "$NetBSD: getarg.c,v 1.3 2008/03/22 08:37:21 mlelstv Exp $");
+        "$NetBSD: getarg.c,v 1.4 2010/01/20 12:54:17 tsutsui Exp $");
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#ifdef HAVE_TERMIOS_H  /* XXX for struct winsize */
+#include <termios.h>
+#endif
+#include "roken-common.h"
+#else
 #include "roken.h"
+#endif
 #include "getarg.h"
 
 #define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/roken/strlcat.c
--- a/crypto/dist/heimdal/lib/roken/strlcat.c   Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/strlcat.c   Wed Jan 20 12:54:17 2010 +0000
@@ -34,10 +34,14 @@
 #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.5 2008/03/22 08:37:22 mlelstv Exp $");
+        "$NetBSD: strlcat.c,v 1.6 2010/01/20 12:54:17 tsutsui Exp $");
 
 #ifndef HAVE_STRLCAT
 
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/roken/strlcpy.c
--- a/crypto/dist/heimdal/lib/roken/strlcpy.c   Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/strlcpy.c   Wed Jan 20 12:54:17 2010 +0000
@@ -34,10 +34,14 @@
 #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.5 2008/03/22 08:37:22 mlelstv Exp $");
+        "$NetBSD: strlcpy.c,v 1.6 2010/01/20 12:54:17 tsutsui Exp $");
 
 #ifndef HAVE_STRLCPY
 
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/roken/strupr.c
--- a/crypto/dist/heimdal/lib/roken/strupr.c    Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/strupr.c    Wed Jan 20 12:54:17 2010 +0000
@@ -34,12 +34,17 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 __RCSID("$Heimdal: strupr.c 21005 2007-06-08 01:54:35Z lha $"
-        "$NetBSD: strupr.c,v 1.5 2008/03/22 08:37:22 mlelstv Exp $");
+        "$NetBSD: strupr.c,v 1.6 2010/01/20 12:54:17 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
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/roken/warnerr.c
--- a/crypto/dist/heimdal/lib/roken/warnerr.c   Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/roken/warnerr.c   Wed Jan 20 12:54:17 2010 +0000
@@ -34,10 +34,16 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 __RCSID("$Heimdal: warnerr.c 14773 2005-04-12 11:29:18Z lha $"
-        "$NetBSD: warnerr.c,v 1.3 2008/03/22 08:37:22 mlelstv Exp $");
+        "$NetBSD: warnerr.c,v 1.4 2010/01/20 12:54:17 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
diff -r 1b86f884de32 -r 72efd870c7bc crypto/dist/heimdal/lib/vers/print_version.c
--- a/crypto/dist/heimdal/lib/vers/print_version.c      Wed Jan 20 12:14:00 2010 +0000
+++ b/crypto/dist/heimdal/lib/vers/print_version.c      Wed Jan 20 12:54:17 2010 +0000
@@ -34,9 +34,15 @@
 #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.8 2008/03/22 08:37:23 mlelstv Exp $");
+        "$NetBSD: print_version.c,v 1.9 2010/01/20 12:54:17 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"