X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=sys%2Finclude%2Flibc.h;h=095615ad76c080551d416d1c8ab16316ae4f21d0;hb=dae0f4d28d3ffa312cab5d751045b1bbab1d897d;hp=041066dd726fba5684a2e1c2aca39a37050ce848;hpb=49ac0b93d3a4652e0bda07d7654c9ffb7c3fb004;p=plan9front.git

diff --git a/sys/include/libc.h b/sys/include/libc.h
index 041066dd7..095615ad7 100644
--- a/sys/include/libc.h
+++ b/sys/include/libc.h
@@ -41,10 +41,12 @@ extern	int	tokenize(char*, char**, int);
 
 enum
 {
-	UTFmax		= 3,		/* maximum bytes per rune */
+	UTFmax		= 4,		/* maximum bytes per rune */
 	Runesync	= 0x80,		/* cannot represent part of a UTF sequence (<) */
 	Runeself	= 0x80,		/* rune and UTF sequences are the same (<) */
 	Runeerror	= 0xFFFD,	/* decoding error in UTF */
+	Runemax		= 0x10FFFF,	/* 21 bit rune */
+	Runemask	= 0x1FFFFF,	/* bits used by runes (see grep) */
 };
 
 /*
@@ -95,10 +97,10 @@ extern	ulong	msize(void*);
 extern	void*	mallocalign(ulong, ulong, long, ulong);
 extern	void*	calloc(ulong, ulong);
 extern	void*	realloc(void*, ulong);
-extern	void	setmalloctag(void*, ulong);
-extern	void	setrealloctag(void*, ulong);
-extern	ulong	getmalloctag(void*);
-extern	ulong	getrealloctag(void*);
+extern	void	setmalloctag(void*, uintptr);
+extern	void	setrealloctag(void*, uintptr);
+extern	uintptr	getmalloctag(void*);
+extern	uintptr	getrealloctag(void*);
 extern	void*	malloctopoolblock(void*);
 
 /*
@@ -177,16 +179,31 @@ extern	Rune*	runefmtstrflush(Fmt*);
 #pragma	varargck	argpos	sprint		2
 
 #pragma	varargck	type	"lld"	vlong
+#pragma	varargck	type	"llo"	vlong
 #pragma	varargck	type	"llx"	vlong
+#pragma	varargck	type	"llb"	vlong
 #pragma	varargck	type	"lld"	uvlong
+#pragma	varargck	type	"llo"	uvlong
 #pragma	varargck	type	"llx"	uvlong
+#pragma	varargck	type	"llb"	uvlong
 #pragma	varargck	type	"ld"	long
+#pragma	varargck	type	"lo"	long
 #pragma	varargck	type	"lx"	long
 #pragma	varargck	type	"lb"	long
 #pragma	varargck	type	"ld"	ulong
+#pragma	varargck	type	"lo"	ulong
 #pragma	varargck	type	"lx"	ulong
 #pragma	varargck	type	"lb"	ulong
+#pragma varargck	type	"zd"	intptr
+#pragma varargck	type	"zo"	intptr
+#pragma varargck	type	"zx"	intptr
+#pragma varargck	type	"zb"	intptr
+#pragma varargck	type	"zd"	uintptr
+#pragma varargck	type	"zo"	uintptr
+#pragma varargck	type	"zx"	uintptr
+#pragma varargck	type	"zb"	uintptr
 #pragma	varargck	type	"d"	int
+#pragma	varargck	type	"o"	int
 #pragma	varargck	type	"x"	int
 #pragma	varargck	type	"c"	int
 #pragma	varargck	type	"C"	int
@@ -465,7 +482,6 @@ extern	void	rsleep(Rendez*);	/* unlocks r->l, sleeps, locks r->l again */
 extern	int	rwakeup(Rendez*);
 extern	int	rwakeupall(Rendez*);
 extern	void**	privalloc(void);
-extern	void	privfree(void**);
 
 /*
  *  network dialing