[src/trunk]: src/crypto/dist/heimdal/lib __RCSID is not a portable macro to b...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/dist/heimdal/lib __RCSID is not a portable macro to b...
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 11:58:07 +0000
details:   https://anonhg.NetBSD.org/src/rev/27f8782f9857
branches:  trunk
changeset: 536357:27f8782f9857
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Sep 13 19:09:00 2002 +0000

description:
__RCSID is not a portable macro to be using in a host tool (which
these files are).  As a short-term work-around, only use it if it
is defined.  A better solution will be worked out with the Heimdal
folks later.

Fixes building these host tools on Solaris 8.

diffstat:

 crypto/dist/heimdal/lib/asn1/gen.c                |  4 +++-
 crypto/dist/heimdal/lib/asn1/gen_copy.c           |  4 +++-
 crypto/dist/heimdal/lib/asn1/gen_decode.c         |  4 +++-
 crypto/dist/heimdal/lib/asn1/gen_encode.c         |  4 +++-
 crypto/dist/heimdal/lib/asn1/gen_free.c           |  4 +++-
 crypto/dist/heimdal/lib/asn1/gen_glue.c           |  4 +++-
 crypto/dist/heimdal/lib/asn1/gen_length.c         |  4 +++-
 crypto/dist/heimdal/lib/asn1/hash.c               |  4 +++-
 crypto/dist/heimdal/lib/asn1/main.c               |  4 +++-
 crypto/dist/heimdal/lib/asn1/parse.y              |  6 ++++--
 crypto/dist/heimdal/lib/asn1/symbol.c             |  4 +++-
 crypto/dist/heimdal/lib/com_err/compile_et.c      |  4 +++-
 crypto/dist/heimdal/lib/com_err/lex.l             |  4 +++-
 crypto/dist/heimdal/lib/com_err/parse.y           |  4 +++-
 crypto/dist/heimdal/lib/roken/emalloc.c           |  4 +++-
 crypto/dist/heimdal/lib/roken/get_window_size.c   |  4 +++-
 crypto/dist/heimdal/lib/roken/getarg.c            |  4 +++-
 crypto/dist/heimdal/lib/roken/print_version.c     |  4 +++-
 crypto/dist/heimdal/lib/roken/strupr.c            |  4 +++-
 crypto/dist/heimdal/lib/roken/warnerr.c           |  4 +++-
 crypto/dist/heimdal/lib/vers/make-print-version.c |  4 +++-
 21 files changed, 64 insertions(+), 22 deletions(-)

diffs (truncated from 324 to 300 lines):

diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/gen.c
--- a/crypto/dist/heimdal/lib/asn1/gen.c        Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen.c        Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: gen.c,v 1.49 2002/09/04 15:06:18 joda Exp $"
-        "$NetBSD: gen.c,v 1.4 2002/09/12 13:19:05 joda Exp $");
+        "$NetBSD: gen.c,v 1.5 2002/09/13 19:09:00 thorpej Exp $");
+#endif
 
 FILE *headerfile, *codefile, *logfile;
 
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/gen_copy.c
--- a/crypto/dist/heimdal/lib/asn1/gen_copy.c   Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_copy.c   Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: gen_copy.c,v 1.12 2001/09/25 13:39:26 assar Exp $"
-        "$NetBSD: gen_copy.c,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: gen_copy.c,v 1.2 2002/09/13 19:09:00 thorpej Exp $");
+#endif
 
 static void
 copy_primitive (const char *typename, const char *from, const char *to)
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/gen_decode.c
--- a/crypto/dist/heimdal/lib/asn1/gen_decode.c Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_decode.c Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: gen_decode.c,v 1.18 2002/08/09 15:37:34 joda Exp $"
-        "$NetBSD: gen_decode.c,v 1.1.1.5 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: gen_decode.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static void
 decode_primitive (const char *typename, const char *name)
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/gen_encode.c
--- a/crypto/dist/heimdal/lib/asn1/gen_encode.c Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_encode.c Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: gen_encode.c,v 1.12 2001/09/25 13:39:26 assar Exp $"
-        "$NetBSD: gen_encode.c,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: gen_encode.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static void
 encode_primitive (const char *typename, const char *name)
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/gen_free.c
--- a/crypto/dist/heimdal/lib/asn1/gen_free.c   Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_free.c   Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: gen_free.c,v 1.9 2001/09/25 13:39:26 assar Exp $"
-        "$NetBSD: gen_free.c,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: gen_free.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static void
 free_primitive (const char *typename, const char *name)
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/gen_glue.c
--- a/crypto/dist/heimdal/lib/asn1/gen_glue.c   Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_glue.c   Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: gen_glue.c,v 1.7 1999/12/02 17:05:02 joda Exp $"
-        "$NetBSD: gen_glue.c,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: gen_glue.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static void
 generate_2int (const Symbol *s)
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/gen_length.c
--- a/crypto/dist/heimdal/lib/asn1/gen_length.c Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/gen_length.c Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: gen_length.c,v 1.11 2001/09/25 13:39:26 assar Exp $"
-        "$NetBSD: gen_length.c,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: gen_length.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static void
 length_primitive (const char *typename,
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/hash.c
--- a/crypto/dist/heimdal/lib/asn1/hash.c       Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/hash.c       Fri Sep 13 19:09:00 2002 +0000
@@ -37,8 +37,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: hash.c,v 1.8 1999/12/02 17:05:02 joda Exp $"
-        "$NetBSD: hash.c,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: hash.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static Hashentry *_search(Hashtab * htab,      /* The hash table */
                          void *ptr);   /* And key */
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/main.c
--- a/crypto/dist/heimdal/lib/asn1/main.c       Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/main.c       Fri Sep 13 19:09:00 2002 +0000
@@ -34,8 +34,10 @@
 #include "gen_locl.h"
 #include <getarg.h>
 
+#ifdef __RCSID
 __RCSID("$Heimdal: main.c,v 1.11 2001/02/20 01:44:52 assar Exp $"
-        "$NetBSD: main.c,v 1.1.1.4 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: main.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 extern FILE *yyin;
 
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/parse.y
--- a/crypto/dist/heimdal/lib/asn1/parse.y      Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/parse.y      Fri Sep 13 19:09:00 2002 +0000
@@ -32,7 +32,7 @@
  */
 
 /* $Heimdal: parse.y,v 1.19 2001/09/27 16:21:47 assar Exp $
-   $NetBSD: parse.y,v 1.1.1.4 2002/09/12 12:41:40 joda Exp $ */
+   $NetBSD: parse.y,v 1.2 2002/09/13 19:09:01 thorpej Exp $ */
 
 %{
 #ifdef HAVE_CONFIG_H
@@ -45,8 +45,10 @@
 #include "lex.h"
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: parse.y,v 1.19 2001/09/27 16:21:47 assar Exp $"
-        "$NetBSD: parse.y,v 1.1.1.4 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: parse.y,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static Type *new_type (Typetype t);
 void yyerror (char *);
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/asn1/symbol.c
--- a/crypto/dist/heimdal/lib/asn1/symbol.c     Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/asn1/symbol.c     Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #include "gen_locl.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: symbol.c,v 1.9 2001/09/25 13:39:27 assar Exp $"
-        "$NetBSD: symbol.c,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $");
+        "$NetBSD: symbol.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static Hashtab *htab;
 
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/com_err/compile_et.c
--- a/crypto/dist/heimdal/lib/com_err/compile_et.c      Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/com_err/compile_et.c      Fri Sep 13 19:09:00 2002 +0000
@@ -35,8 +35,10 @@
 #include "compile_et.h"
 #include <getarg.h>
 
+#ifdef __RCSID
 __RCSID("$Heimdal: compile_et.c,v 1.16 2002/08/20 12:44:51 joda Exp $"
-        "$NetBSD: compile_et.c,v 1.1.1.4 2002/09/12 12:41:44 joda Exp $");
+        "$NetBSD: compile_et.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 #include <roken.h>
 #include <err.h>
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/com_err/lex.l
--- a/crypto/dist/heimdal/lib/com_err/lex.l     Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/com_err/lex.l     Fri Sep 13 19:09:00 2002 +0000
@@ -44,8 +44,10 @@
 #include "parse.h"
 #include "lex.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: lex.l,v 1.6 2000/06/22 00:42:52 assar Exp $"
-        "$NetBSD: lex.l,v 1.1.1.3 2002/09/12 12:41:44 joda Exp $");
+        "$NetBSD: lex.l,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 static unsigned lineno = 1;
 static int getstring(void);
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/com_err/parse.y
--- a/crypto/dist/heimdal/lib/com_err/parse.y   Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/com_err/parse.y   Fri Sep 13 19:09:00 2002 +0000
@@ -35,8 +35,10 @@
 #include "compile_et.h"
 #include "lex.h"
 
+#ifdef __RCSID
 __RCSID("$Heimdal: parse.y,v 1.11 2000/06/22 00:42:52 assar Exp $"
-        "$NetBSD: parse.y,v 1.1.1.3 2002/09/12 12:41:44 joda Exp $");
+        "$NetBSD: parse.y,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 
 void yyerror (char *s);
 static long name2number(const char *str);
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/roken/emalloc.c
--- a/crypto/dist/heimdal/lib/roken/emalloc.c   Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/roken/emalloc.c   Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#ifdef __RCSID
 __RCSID("$Heimdal: emalloc.c,v 1.5 2001/06/17 12:07:48 assar Exp $"
-        "$NetBSD: emalloc.c,v 1.1.1.4 2002/09/12 12:41:41 joda Exp $");
+        "$NetBSD: emalloc.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 #endif
 
 #include <stdlib.h>
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/roken/get_window_size.c
--- a/crypto/dist/heimdal/lib/roken/get_window_size.c   Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/roken/get_window_size.c   Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#ifdef __RCSID
 __RCSID("$Heimdal: get_window_size.c,v 1.9 1999/12/02 16:58:46 joda Exp $"
-        "$NetBSD: get_window_size.c,v 1.1.1.3 2002/09/12 12:41:42 joda Exp $");
+        "$NetBSD: get_window_size.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 #endif
 
 #include <stdlib.h>
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/roken/getarg.c
--- a/crypto/dist/heimdal/lib/roken/getarg.c    Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/roken/getarg.c    Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#ifdef __RCSID
 __RCSID("$Heimdal: getarg.c,v 1.46 2002/08/20 16:23:07 joda Exp $"
-        "$NetBSD: getarg.c,v 1.1.1.6 2002/09/12 12:41:42 joda Exp $");
+        "$NetBSD: getarg.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 #endif
 
 #include <stdio.h>
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/roken/print_version.c
--- a/crypto/dist/heimdal/lib/roken/print_version.c     Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/roken/print_version.c     Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#ifdef __RCSID
 __RCSID("$Heimdal: print_version.c,v 1.8 2001/02/20 01:44:55 assar Exp $"
-        "$NetBSD: print_version.c,v 1.1.1.5 2002/09/12 12:41:42 joda Exp $");
+        "$NetBSD: print_version.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 #endif
 #include "roken.h"
 
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/roken/strupr.c
--- a/crypto/dist/heimdal/lib/roken/strupr.c    Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/roken/strupr.c    Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#ifdef __RCSID
 __RCSID("$Heimdal: strupr.c,v 1.4 1999/12/02 16:58:53 joda Exp $"
-        "$NetBSD: strupr.c,v 1.1.1.3 2002/09/12 12:41:42 joda Exp $");
+        "$NetBSD: strupr.c,v 1.2 2002/09/13 19:09:01 thorpej Exp $");
+#endif
 #endif
 #include <string.h>
 #include <ctype.h>
diff -r d21850149b30 -r 27f8782f9857 crypto/dist/heimdal/lib/roken/warnerr.c
--- a/crypto/dist/heimdal/lib/roken/warnerr.c   Fri Sep 13 19:07:01 2002 +0000
+++ b/crypto/dist/heimdal/lib/roken/warnerr.c   Fri Sep 13 19:09:00 2002 +0000
@@ -33,8 +33,10 @@
 
 #ifdef HAVE_CONFIG_H
Prev by Date: [src/trunk]: src/share/man/man4/man4.sparc Our X man page is in 7.
Next by Date: [src/trunk]: src/usr.bin/whatis config.[ch] -> manconf.[ch]
Previous by Thread: [src/trunk]: src/share/man/man4/man4.sparc Our X man page is in 7.
Next by Thread: [src/trunk]: src/usr.bin/whatis config.[ch] -> manconf.[ch]
Indexes:
Home | Main Index | Thread Index | Old Index