libixp

commit 33ec8ff4158aa6373705a29e88ec8748e099e96e
parent d80625259636e5b3935df4f91248ea30153a600f
Author: Kris Maglione <kris@suckless.org>
Date:   Wed, 23 Jun 2010 14:09:50 -0400

Fix build error.

Diffstat:
include/ixp.h
 | 
15
+++++++--------
lib/libixp/client.c
 | 
4
++--

2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/ixp.h b/include/ixp.h
@@ -30,8 +30,8 @@
  * of libixp with a different API version than it was compiled
  * against.
  */
-#define IXP_API 134
-#define _IXP_ASSERT_VERSION ixp_version_ ## 134 ## _required
+#define IXP_API 135
+#define _IXP_ASSERT_VERSION ixp_version_ ## 135 ## _required
 
 #ifndef IXP_NEEDAPI
 #define IXP_NEEDAPI IXP_API
@@ -70,6 +70,9 @@ typedef uint32_t	ulong;
 typedef uint64_t	uvlong;
 
 typedef int64_t		vlong;
+
+# define respond ixp_respond
+# define serve_9pcon ixp_serve9pconn
 #endif
 
 #undef	uint
@@ -407,6 +410,7 @@ struct IxpFTWStat {
 	IxpFHdr		hdr;
 	IxpStat		stat;
 };
+
 #if IXP_NEEDAPI <= 89
 /* from fcall(3) in plan9port */
 typedef struct IxpFcall IxpFcall; /* Deprecated */
@@ -742,7 +746,7 @@ int	ixp_remove(IxpClient*, const char*);
 void	ixp_unmount(IxpClient*);
 int	ixp_vprint(IxpCFid*, const char*, va_list);
 long	ixp_write(IxpCFid*, const void*, long);
-IxpCFid*	ixp_create(IxpClient*, const char*, uint perm, int8_t mode);
+IxpCFid*	ixp_create(IxpClient*, const char*, uint perm, uint8_t mode);
 IxpStat*	ixp_fstat(IxpCFid*);
 IxpClient*	ixp_mount(const char*);
 IxpClient*	ixp_mountfd(int);
@@ -773,11 +777,6 @@ void	ixp_werrstr(const char*, ...);
 void ixp_respond(Ixp9Req*, const char *err);
 void ixp_serve9conn(IxpConn*);
 
-#if IXP_NEEDAPI < 127
-# define respond ixp_respond
-# define serve_9pcon ixp_serve9pconn
-#endif
-
 /* message.c */
 uint16_t	ixp_sizeof_stat(IxpStat*);
 IxpMsg	ixp_message(char*, uint len, uint mode);
diff --git a/lib/libixp/client.c b/lib/libixp/client.c
@@ -366,7 +366,7 @@ initfid(IxpCFid *f, IxpFcall *fcall) {
  */
 
 IxpCFid*
-ixp_create(IxpClient *c, const char *path, uint perm, uchar mode) {
+ixp_create(IxpClient *c, const char *path, uint perm, uint8_t mode) {
 	IxpFcall fcall;
 	IxpCFid *f;
 	char *tpath;;
@@ -400,7 +400,7 @@ done:
 }
 
 IxpCFid*
-ixp_open(IxpClient *c, const char *path, uchar mode) {
+ixp_open(IxpClient *c, const char *path, uint8_t mode) {
 	IxpFcall fcall;
 	IxpCFid *f;