From 243321b4bbe273cf3a9105ca132caa2b53e2f263 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 26 Aug 2008 19:35:52 +0200
Subject: heimdal: import heimdal's trunk svn rev 23697 + lorikeet-heimdal
 patches

This is based on f56a3b1846c7d462542f2e9527f4d0ed8a34748d in my heimdal-wip repo.

metze
(This used to be commit 467a1f2163a63cdf1a4c83a69473db50e8794f53)
---
 source4/heimdal/lib/roken/vis.hin | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'source4/heimdal/lib/roken/vis.hin')

diff --git a/source4/heimdal/lib/roken/vis.hin b/source4/heimdal/lib/roken/vis.hin
index 224870b00a..64274526e4 100644
--- a/source4/heimdal/lib/roken/vis.hin
+++ b/source4/heimdal/lib/roken/vis.hin
@@ -1,5 +1,4 @@
-/*	$NetBSD: vis.h,v 1.11 1999/11/25 16:55:50 wennmach Exp $	*/
-/*	$Id: vis.hin 19341 2006-12-15 11:53:09Z lha $	*/
+/*	$NetBSD: vis.h,v 1.16 2005/09/13 01:44:32 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -43,6 +42,8 @@
 #endif
 #endif
 
+#include <sys/types.h>
+
 /*
  * to select alternate encoding format
  */
@@ -63,6 +64,7 @@
  * other
  */
 #define	VIS_NOSLASH	0x40	/* inhibit printing '\' */
+#define	VIS_HTTPSTYLE	0x80	/* http-style escape % HEX HEX */
 
 /*
  * unvis return codes
@@ -78,22 +80,28 @@
  */
 #define	UNVIS_END	1	/* no more characters */
 
-char ROKEN_LIB_FUNCTION
-	*rk_vis (char *, int, int, int);
-char ROKEN_LIB_FUNCTION
-	*rk_svis (char *, int, int, int, const char *);
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+char * ROKEN_LIB_FUNCTION
+	rk_vis(char *, int, int, int);
+char * ROKEN_LIB_FUNCTION
+	rk_svis(char *, int, int, int, const char *);
+int ROKEN_LIB_FUNCTION
+	rk_strvis(char *, const char *, int);
 int ROKEN_LIB_FUNCTION
-	rk_strvis (char *, const char *, int);
+	rk_strsvis(char *, const char *, int, const char *);
 int ROKEN_LIB_FUNCTION
-	rk_strsvis (char *, const char *, int, const char *);
+	rk_strvisx(char *, const char *, size_t, int);
 int ROKEN_LIB_FUNCTION
-	rk_strvisx (char *, const char *, size_t, int);
+	rk_strsvisx(char *, const char *, size_t, int, const char *);
 int ROKEN_LIB_FUNCTION
-	rk_strsvisx (char *, const char *, size_t, int, const char *);
+	rk_strunvis(char *, const char *);
 int ROKEN_LIB_FUNCTION
-	rk_strunvis (char *, const char *);
+	rk_strunvisx(char *, const char *, int);
 int ROKEN_LIB_FUNCTION
-	rk_unvis (char *, int, int *, int);
+	rk_unvis(char *, int, int *, int);
+__END_DECLS
 
 #undef vis
 #define vis(a,b,c,d) rk_vis(a,b,c,d)
-- 
cgit