[hackers] [libixp] Fix build error. || Kris Maglione

changeset: 135:a638391ec27b
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Wed Jun 23 14:09:50 2010 -0400
files: include/ixp.h lib/libixp/client.c
description:
Fix build error.

diff -r d2e397b59ed1 -r a638391ec27b include/ixp.h
--- a/include/ixp.h Wed Jun 23 13:53:42 2010 -0400
+++ b/include/ixp.h Wed Jun 23 14:09:50 2010 -0400
@@ -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 uint64_t uvlong;
 
 typedef int64_t vlong;
+
+# define respond ixp_respond
+# define serve_9pcon ixp_serve9pconn
 #endif
 
 #undef uint
@@ -407,6 +410,7 @@
         IxpFHdr hdr;
         IxpStat stat;
 };
+
 #if IXP_NEEDAPI <= 89
 /* from fcall(3) in plan9port */
 typedef struct IxpFcall IxpFcall; /* Deprecated */
@@ -742,7 +746,7 @@
 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_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 -r d2e397b59ed1 -r a638391ec27b lib/libixp/client.c
--- a/lib/libixp/client.c Wed Jun 23 13:53:42 2010 -0400
+++ b/lib/libixp/client.c Wed Jun 23 14:09:50 2010 -0400
@@ -366,7 +366,7 @@
  */
 
 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 @@
 }
 
 IxpCFid*
-ixp_open(IxpClient *c, const char *path, uchar mode) {
+ixp_open(IxpClient *c, const char *path, uint8_t mode) {
         IxpFcall fcall;
         IxpCFid *f;
 
Received on Wed Jun 23 2010 - 18:10:01 UTC