CVS commit: src/include/arpa
Module Name:src
Committed By: christos
Date: Sat Oct 10 19:51:48 UTC 2020
Modified Files:
src/include/arpa: nameser.h
Log Message:
- remove bitypes.h fossil
- define u_{char,short,int,long} if we don't have _NETBSD_SOURCE defined
so that this compiles (and resolv.h since it includes this). This is
the simplest solution. Others:
- always define them (bad, pollutes namespace)
- create (bad, overkill)
- change them to unsigned {char, short, int long} (bad, too disruptive)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/include/arpa/nameser.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/arpa/nameser.h
diff -u src/include/arpa/nameser.h:1.25 src/include/arpa/nameser.h:1.26
--- src/include/arpa/nameser.h:1.25 Sun Apr 12 13:07:34 2009
+++ src/include/arpa/nameser.h Sat Oct 10 15:51:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nameser.h,v 1.25 2009/04/12 17:07:34 christos Exp $ */
+/* $NetBSD: nameser.h,v 1.26 2020/10/10 19:51:48 christos Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -56,13 +56,16 @@
#define BIND_4_COMPAT
#include
-#if (!defined(BSD)) || (BSD < 199306)
-# include
-#else
-# include
-#endif
+#include
#include
+#if !defined(_NETBSD_SOURCE)
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+typedef unsigned int u_int;
+typedef unsigned long u_long;
+#endif
+
/*%
* Revision information. This is the release date in MMDD format.
* It can change every day so the right thing to do with it is use it
CVS commit: src/include/arpa
Module Name:src Committed By: gutteridge Date: Sun Jun 28 02:16:19 UTC 2020 Modified Files: src/include/arpa: nameser_compat.h Log Message: nameser_compat.h: correct preprocessor error syntax To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/include/arpa/nameser_compat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/arpa/nameser_compat.h diff -u src/include/arpa/nameser_compat.h:1.6 src/include/arpa/nameser_compat.h:1.7 --- src/include/arpa/nameser_compat.h:1.6 Tue Feb 24 17:57:08 2015 +++ src/include/arpa/nameser_compat.h Sun Jun 28 02:16:19 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nameser_compat.h,v 1.6 2015/02/24 17:57:08 christos Exp $ */ +/* $NetBSD: nameser_compat.h,v 1.7 2020/06/28 02:16:19 gutteridge Exp $ */ /* Copyright (c) 1983, 1989 *The Regents of the University of California. All rights reserved. @@ -82,7 +82,7 @@ * which will force your compiles to bomb until you fix * the above macros. */ - error "Undefined or invalid BYTE_ORDER"; +#error "Undefined or invalid BYTE_ORDER" #endif /*%
CVS commit: src/include/arpa
Module Name:src
Committed By: christos
Date: Thu Jan 12 18:42:53 UTC 2017
Modified Files:
src/include/arpa: ftp.h telnet.h
Log Message:
Welcome to the constant age!
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/include/arpa/ftp.h
cvs rdiff -u -r1.12 -r1.13 src/include/arpa/telnet.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/arpa/ftp.h
diff -u src/include/arpa/ftp.h:1.6 src/include/arpa/ftp.h:1.7
--- src/include/arpa/ftp.h:1.6 Thu Aug 7 05:44:12 2003
+++ src/include/arpa/ftp.h Thu Jan 12 13:42:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.h,v 1.6 2003/08/07 09:44:12 agc Exp $ */
+/* $NetBSD: ftp.h,v 1.7 2017/01/12 18:42:53 christos Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -54,7 +54,7 @@
#define TYPE_L 4 /* local byte size */
#ifdef FTP_NAMES
-char *typenames[] = {"0", "ASCII", "EBCDIC", "Image", "Local" };
+const char *typenames[] = {"0", "ASCII", "EBCDIC", "Image", "Local" };
#endif
/*
@@ -64,7 +64,7 @@ char *typenames[] = {"0", "ASCII", "EBC
#define FORM_T 2 /* telnet format effectors */
#define FORM_C 3 /* carriage control (ASA) */
#ifdef FTP_NAMES
-char *formnames[] = {"0", "Nonprint", "Telnet", "Carriage-control" };
+const char *formnames[] = {"0", "Nonprint", "Telnet", "Carriage-control" };
#endif
/*
@@ -74,7 +74,7 @@ char *formnames[] = {"0", "Nonprint", "
#define STRU_R 2 /* record structure */
#define STRU_P 3 /* page structure */
#ifdef FTP_NAMES
-char *strunames[] = {"0", "File", "Record", "Page" };
+const char *strunames[] = {"0", "File", "Record", "Page" };
#endif
/*
@@ -84,7 +84,7 @@ char *strunames[] = {"0", "File", "Reco
#define MODE_B 2 /* block */
#define MODE_C 3 /* compressed */
#ifdef FTP_NAMES
-char *modenames[] = {"0", "Stream", "Block", "Compressed" };
+const char *modenames[] = {"0", "Stream", "Block", "Compressed" };
#endif
/*
Index: src/include/arpa/telnet.h
diff -u src/include/arpa/telnet.h:1.12 src/include/arpa/telnet.h:1.13
--- src/include/arpa/telnet.h:1.12 Tue Jan 24 12:13:59 2006
+++ src/include/arpa/telnet.h Thu Jan 12 13:42:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: telnet.h,v 1.12 2006/01/24 17:13:59 christos Exp $ */
+/* $NetBSD: telnet.h,v 1.13 2017/01/12 18:42:53 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -231,11 +231,11 @@ extern const char *telopts[NTELOPTS+1];
0
#ifdef SLC_NAMES
-char *slc_names[] = {
+const char *slc_names[] = {
SLC_NAMELIST
};
#else
-extern char *slc_names[];
+extern const char *slc_names[];
#define SLC_NAMES SLC_NAMELIST
#endif
CVS commit: src/include/arpa
Module Name:src Committed By: christos Date: Tue Feb 24 17:57:08 UTC 2015 Modified Files: src/include/arpa: nameser_compat.h Log Message: belated removal of the advertising clause. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/include/arpa/nameser_compat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/arpa/nameser_compat.h diff -u src/include/arpa/nameser_compat.h:1.5 src/include/arpa/nameser_compat.h:1.6 --- src/include/arpa/nameser_compat.h:1.5 Sun Apr 12 13:07:34 2009 +++ src/include/arpa/nameser_compat.h Tue Feb 24 12:57:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nameser_compat.h,v 1.5 2009/04/12 17:07:34 christos Exp $ */ +/* $NetBSD: nameser_compat.h,v 1.6 2015/02/24 17:57:08 christos Exp $ */ /* Copyright (c) 1983, 1989 *The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors *may be used to endorse or promote products derived from this software *without specific prior written permission. *
