From d1b4cfde55d1ba163047cb49b1305452be6f66fc Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Wed, 9 Jun 2004 14:12:04 +0000
Subject: use plan9 malloc

---
 src/lib9/fmt/fmtdef.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lib9/fmt/fmtdef.h')

diff --git a/src/lib9/fmt/fmtdef.h b/src/lib9/fmt/fmtdef.h
index ca2010ab..89468767 100644
--- a/src/lib9/fmt/fmtdef.h
+++ b/src/lib9/fmt/fmtdef.h
@@ -25,7 +25,9 @@
 #define vlong _fmtvlong
 #define uvlong _fmtuvlong
 
+#ifndef USED
 #define USED(x) if(x);else
+#endif
 
 typedef unsigned char		uchar;
 typedef unsigned short		ushort;
@@ -37,6 +39,7 @@ typedef unsigned long long	uvlong;
 typedef long long		vlong;
 #endif
 
+#undef nil
 #define nil		0	/* cannot be ((void*)0) because used for function pointers */
 
 typedef int (*Fmts)(Fmt*);
-- 
cgit v1.2.3