merged OpenSSH 4.1p1 to trunk

[gssapi-openssh.git] / openssh / openbsd-compat / vis.h

diff --git a/openssh/openbsd-compat/vis.h b/openssh/openbsd-compat/vis.h
index 5df6f3694fce69790c7a01998bb0d75d79c0e10a..663355a240f0566339928f86b7d3abedeb768f18 100644 (file)
--- a/openssh/openbsd-compat/vis.h
+++ b/openssh/openbsd-compat/vis.h
@@ -1,4 +1,6 @@
-/*     $OpenBSD: vis.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */
+/* OPENBSD ORIGINAL: include/vis.h */
+
+/*     $OpenBSD: vis.h,v 1.6 2003/06/02 19:34:12 millert Exp $ */
 /*     $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $      */
 
 /*-
@@ -13,11 +15,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.
  *
@@ -35,7 +33,8 @@
  *
  *     @(#)vis.h       5.9 (Berkeley) 4/3/91
  */
-#include "config.h"
+
+#include "includes.h"
 #if !defined(HAVE_STRNVIS)
 
 #ifndef _VIS_H_